[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: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 90e9405903babd521f7d9591e7971e0f00b1201b..602a93e8892540e38050e602fec4fb5919141b3c 100644 (file)
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -265,7 +265,6 @@ struct _wlan_adapter {
        u8 scantype;
        u32 scanmode;
 
-       u16 beaconperiod;
        u8 adhoccreate;
 
        /** capability Info used in Association, start, join */

diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index 95c21bae60f5726ac13fc37f312d5bc11ae5eed2..c16d1f625d1b1d87efbc30e0e579bf869c4f35ab 100644 (file)
--- 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,
        /* set the BSS type */
        adhs->bsstype = CMD_BSS_TYPE_IBSS;
        adapter->mode = IW_MODE_ADHOC;
-       adhs->beaconperiod = cpu_to_le16(adapter->beaconperiod);
+       adhs->beaconperiod = cpu_to_le16(MRVDRV_BEACON_INTERVAL);
 
        /* set Physical param set */
 #define DS_PARA_IE_ID   3

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index ab8dcbf5bfc90bd9a8041a83f0eef0c9cb240dfb..1c8760ca864450371ce96308e908890f910fadea 100644 (file)
--- 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)
        adapter->auto_rate = 1;
        adapter->cur_rate = 0;
 
-       adapter->beaconperiod = MRVDRV_BEACON_INTERVAL;
-
        // set default capabilities
        adapter->capability = WLAN_CAPABILITY_SHORT_PREAMBLE;