[PATCH] libertas: remove adapter->locallisteninterval

locallisteninterval was initialized with 0, but there is no code that
changes it, rendering it rather useless.

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/cmd.c b/drivers/net/wireless/libertas/cmd.c
index f5d4971f13a0ab32808da68ef34f1adc38be3cc7..276d981e7d3dcbc27cc69e0edcde57b97596c37c 100644 (file)
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -56,7 +56,6 @@ static int wlan_cmd_802_11_ps_mode(wlan_private * priv,
                                   u16 cmd_action)
 {
        struct cmd_ds_802_11_ps_mode *psm = &cmd->params.psmode;
-       wlan_adapter *adapter = priv->adapter;
 
        lbs_deb_enter(LBS_DEB_CMD);
 
@@ -68,11 +67,8 @@ static int wlan_cmd_802_11_ps_mode(wlan_private * priv,
        switch (cmd_action) {
        case CMD_SUBCMD_ENTER_PS:
                lbs_deb_cmd("PS command:" "SubCode- Enter PS\n");
-               lbs_deb_cmd("locallisteninterval %d\n",
-                      adapter->locallisteninterval);
 
-               psm->locallisteninterval =
-                   cpu_to_le16(adapter->locallisteninterval);
+               psm->locallisteninterval = 0;
                psm->nullpktinterval = 0;
                psm->multipledtim =
                    cpu_to_le16(priv->adapter->multipledtim);

diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 6e78e315a8b3114c4187e1d538debe35ff12f35b..cf4ed5d0145854737d61bc35d8d387ab2fad638a 100644 (file)
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -312,7 +312,6 @@ struct _wlan_adapter {
        u8 needtowakeup;
 
        struct PS_CMD_ConfirmSleep libertas_ps_confirm_sleep;
-       u16 locallisteninterval;
 
        struct assoc_request * pending_assoc_req;
        struct assoc_request * in_progress_assoc_req;

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 6ba3fa498e99e542fbc2193fd7ed81d5fbc68370..c35605acf82092fe1337400fe6afd889aad69341 100644 (file)
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1059,7 +1059,6 @@ static void wlan_init_adapter(wlan_private * priv)
 
        adapter->psstate = PS_STATE_FULL_POWER;
        adapter->needtowakeup = 0;
-       adapter->locallisteninterval = 0;       /* default value in firmware will be used */
 
        adapter->intcounter = 0;