[PATCH] libertas: remove adapter->atimwindow

This varaible was initialized with 0 but there is no code that would ever
change it's value. So it can go away.

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 0f383e3f6f0652148747adf96f8a7c4749ad5f6c..693058ad02394e910929926098447fc632e82b6d 100644 (file)
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -303,7 +303,6 @@ struct _wlan_adapter {
 
        /** POWER MANAGEMENT AND PnP SUPPORT */
        u8 surpriseremoved;
-       u16 atimwindow;
 
        u16 psmode;             /* Wlan802_11PowermodeCAM=disable
                                   Wlan802_11PowermodeMAX_PSP=enable */

diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index 08034917d4b55a37482e79be6d81faf43a18a30b..0bded0c91495075e6eb225619fddc132e1d7e02b 100644 (file)
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -518,7 +518,7 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
 
        adhs->ssparamset.ibssparamset.elementid = IBSS_PARA_IE_ID;
        adhs->ssparamset.ibssparamset.len = IBSS_PARA_IE_LEN;
-       adhs->ssparamset.ibssparamset.atimwindow = cpu_to_le16(adapter->atimwindow);
+       adhs->ssparamset.ibssparamset.atimwindow = 0;
 
        /* set capability info */
        tmpcap = WLAN_CAPABILITY_IBSS;

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index df06d40ffdea2684d9f3350794fd06b9744c2d0b..d227e453f9843fc641bbf94e931832fdd866d893 100644 (file)
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -998,9 +998,6 @@ static void wlan_init_adapter(wlan_private * priv)
        wlan_adapter *adapter = priv->adapter;
        int i;
 
-       /* ATIM params */
-       adapter->atimwindow = 0;
-
        adapter->connect_status = LIBERTAS_DISCONNECTED;
        memset(adapter->current_addr, 0xff, ETH_ALEN);