diff options
-rw-r--r-- | drivers/net/wireless/libertas/dev.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/join.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/main.c | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h index 90e9405903ba..602a93e88925 100644 --- a/drivers/net/wireless/libertas/dev.h +++ b/drivers/net/wireless/libertas/dev.h | |||
@@ -265,7 +265,6 @@ struct _wlan_adapter { | |||
265 | u8 scantype; | 265 | u8 scantype; |
266 | u32 scanmode; | 266 | u32 scanmode; |
267 | 267 | ||
268 | u16 beaconperiod; | ||
269 | u8 adhoccreate; | 268 | u8 adhoccreate; |
270 | 269 | ||
271 | /** capability Info used in Association, start, join */ | 270 | /** capability Info used in Association, start, join */ |
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c index 95c21bae60f5..c16d1f625d1b 100644 --- a/drivers/net/wireless/libertas/join.c +++ b/drivers/net/wireless/libertas/join.c | |||
@@ -496,7 +496,7 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv, | |||
496 | /* set the BSS type */ | 496 | /* set the BSS type */ |
497 | adhs->bsstype = CMD_BSS_TYPE_IBSS; | 497 | adhs->bsstype = CMD_BSS_TYPE_IBSS; |
498 | adapter->mode = IW_MODE_ADHOC; | 498 | adapter->mode = IW_MODE_ADHOC; |
499 | adhs->beaconperiod = cpu_to_le16(adapter->beaconperiod); | 499 | adhs->beaconperiod = cpu_to_le16(MRVDRV_BEACON_INTERVAL); |
500 | 500 | ||
501 | /* set Physical param set */ | 501 | /* set Physical param set */ |
502 | #define DS_PARA_IE_ID 3 | 502 | #define DS_PARA_IE_ID 3 |
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index ab8dcbf5bfc9..1c8760ca8644 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
@@ -1043,8 +1043,6 @@ static void wlan_init_adapter(wlan_private * priv) | |||
1043 | adapter->auto_rate = 1; | 1043 | adapter->auto_rate = 1; |
1044 | adapter->cur_rate = 0; | 1044 | adapter->cur_rate = 0; |
1045 | 1045 | ||
1046 | adapter->beaconperiod = MRVDRV_BEACON_INTERVAL; | ||
1047 | |||
1048 | // set default capabilities | 1046 | // set default capabilities |
1049 | adapter->capability = WLAN_CAPABILITY_SHORT_PREAMBLE; | 1047 | adapter->capability = WLAN_CAPABILITY_SHORT_PREAMBLE; |
1050 | 1048 | ||