Commit 2c85103d authored by Holger Schurig's avatar Holger Schurig Committed by David S. Miller

[PATCH] libertas: remove adapter->beaconperiod

beaconperiod was initialized with MRVDRV_BEACON_INTERVAL, but there is
no code that would ever change it's value. We can use the define directly.
Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 85c93e51
...@@ -265,7 +265,6 @@ struct _wlan_adapter { ...@@ -265,7 +265,6 @@ struct _wlan_adapter {
u8 scantype; u8 scantype;
u32 scanmode; u32 scanmode;
u16 beaconperiod;
u8 adhoccreate; u8 adhoccreate;
/** capability Info used in Association, start, join */ /** capability Info used in Association, start, join */
......
...@@ -496,7 +496,7 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv, ...@@ -496,7 +496,7 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
/* set the BSS type */ /* set the BSS type */
adhs->bsstype = CMD_BSS_TYPE_IBSS; adhs->bsstype = CMD_BSS_TYPE_IBSS;
adapter->mode = IW_MODE_ADHOC; adapter->mode = IW_MODE_ADHOC;
adhs->beaconperiod = cpu_to_le16(adapter->beaconperiod); adhs->beaconperiod = cpu_to_le16(MRVDRV_BEACON_INTERVAL);
/* set Physical param set */ /* set Physical param set */
#define DS_PARA_IE_ID 3 #define DS_PARA_IE_ID 3
......
...@@ -1043,8 +1043,6 @@ static void wlan_init_adapter(wlan_private * priv) ...@@ -1043,8 +1043,6 @@ static void wlan_init_adapter(wlan_private * priv)
adapter->auto_rate = 1; adapter->auto_rate = 1;
adapter->cur_rate = 0; adapter->cur_rate = 0;
adapter->beaconperiod = MRVDRV_BEACON_INTERVAL;
// set default capabilities // set default capabilities
adapter->capability = WLAN_CAPABILITY_SHORT_PREAMBLE; adapter->capability = WLAN_CAPABILITY_SHORT_PREAMBLE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment