Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[safe/jmp/linux-2.6] / drivers / net / ps3_gelic_wireless.h

diff --git a/drivers/net/ps3_gelic_wireless.h b/drivers/net/ps3_gelic_wireless.h
index 1036971..0a88b53 100644 (file)
--- a/drivers/net/ps3_gelic_wireless.h
+++ b/drivers/net/ps3_gelic_wireless.h
@@ -164,8 +164,8 @@ struct gelic_eurus_scan_info {
        __be16 security;
        u8  bssid[8]; /* last ETH_ALEN are valid. bssid[0],[1] are unused */
        u8  essid[32]; /* IW_ESSID_MAX_SIZE */
-       u8  rate[16]; /* first MAX_RATES_LENGTH(12) are valid */
-       u8  ext_rate[16]; /* first MAX_RATES_EX_LENGTH(16) are valid */
+       u8  rate[16]; /* first 12 are valid */
+       u8  ext_rate[16]; /* first 16 are valid */
        __be32 reserved1;
        __be32 reserved2;
        __be32 reserved3;
@@ -199,7 +199,7 @@ struct gelic_eurus_rssi_info {
 /* for 'stat' member of gelic_wl_info */
 enum gelic_wl_info_status_bit {
        GELIC_WL_STAT_CONFIGURED,
-       GELIC_WL_STAT_CH_INFO,   /* ch info aquired */
+       GELIC_WL_STAT_CH_INFO,   /* ch info acquired */
        GELIC_WL_STAT_ESSID_SET, /* ESSID specified by userspace */
        GELIC_WL_STAT_BSSID_SET, /* BSSID specified by userspace */
        GELIC_WL_STAT_WPA_PSK_SET, /* PMK specified by userspace */
@@ -241,7 +241,7 @@ enum gelic_wl_assoc_state {
 #define GELIC_WEP_KEYS 4
 struct gelic_wl_info {
        /* bss list */
-       struct semaphore scan_lock;
+       struct mutex scan_lock;
        struct list_head network_list;
        struct list_head network_free_list;
        struct gelic_wl_scan_info *networks;
@@ -266,7 +266,7 @@ struct gelic_wl_info {
        enum gelic_wl_wpa_level wpa_level; /* wpa/wpa2 */
 
        /* association handling */
-       struct semaphore assoc_stat_lock;
+       struct mutex assoc_stat_lock;
        struct delayed_work assoc_work;
        enum gelic_wl_assoc_state assoc_stat;
        struct completion assoc_done;
@@ -288,9 +288,6 @@ struct gelic_wl_info {
        u8 active_bssid[ETH_ALEN]; /* associated bssid */
        unsigned int essid_len;
 
-       /* buffer for hypervisor IO */
-       void *buf;
-
        struct iw_public_data wireless_data;
        struct iw_statistics iwstat;
 };