aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-08-02 13:09:34 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:50:03 -0400
commit252cf0d10f76d3edcd808d462dcfbd544875a0be (patch)
treeafbb3bac7edd188f1c4b2520d6a256c3e11281b4
parent97605c3eb3dee943a45584be92c46be1305b3ef5 (diff)
[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>
-rw-r--r--drivers/net/wireless/libertas/cmd.c6
-rw-r--r--drivers/net/wireless/libertas/dev.h1
-rw-r--r--drivers/net/wireless/libertas/main.c1
3 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index f5d4971f13a0..276d981e7d3d 100644
--- 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,
56 u16 cmd_action) 56 u16 cmd_action)
57{ 57{
58 struct cmd_ds_802_11_ps_mode *psm = &cmd->params.psmode; 58 struct cmd_ds_802_11_ps_mode *psm = &cmd->params.psmode;
59 wlan_adapter *adapter = priv->adapter;
60 59
61 lbs_deb_enter(LBS_DEB_CMD); 60 lbs_deb_enter(LBS_DEB_CMD);
62 61
@@ -68,11 +67,8 @@ static int wlan_cmd_802_11_ps_mode(wlan_private * priv,
68 switch (cmd_action) { 67 switch (cmd_action) {
69 case CMD_SUBCMD_ENTER_PS: 68 case CMD_SUBCMD_ENTER_PS:
70 lbs_deb_cmd("PS command:" "SubCode- Enter PS\n"); 69 lbs_deb_cmd("PS command:" "SubCode- Enter PS\n");
71 lbs_deb_cmd("locallisteninterval %d\n",
72 adapter->locallisteninterval);
73 70
74 psm->locallisteninterval = 71 psm->locallisteninterval = 0;
75 cpu_to_le16(adapter->locallisteninterval);
76 psm->nullpktinterval = 0; 72 psm->nullpktinterval = 0;
77 psm->multipledtim = 73 psm->multipledtim =
78 cpu_to_le16(priv->adapter->multipledtim); 74 cpu_to_le16(priv->adapter->multipledtim);
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 6e78e315a8b3..cf4ed5d01458 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -312,7 +312,6 @@ struct _wlan_adapter {
312 u8 needtowakeup; 312 u8 needtowakeup;
313 313
314 struct PS_CMD_ConfirmSleep libertas_ps_confirm_sleep; 314 struct PS_CMD_ConfirmSleep libertas_ps_confirm_sleep;
315 u16 locallisteninterval;
316 315
317 struct assoc_request * pending_assoc_req; 316 struct assoc_request * pending_assoc_req;
318 struct assoc_request * in_progress_assoc_req; 317 struct assoc_request * in_progress_assoc_req;
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 6ba3fa498e99..c35605acf820 100644
--- 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)
1059 1059
1060 adapter->psstate = PS_STATE_FULL_POWER; 1060 adapter->psstate = PS_STATE_FULL_POWER;
1061 adapter->needtowakeup = 0; 1061 adapter->needtowakeup = 0;
1062 adapter->locallisteninterval = 0; /* default value in firmware will be used */
1063 1062
1064 adapter->intcounter = 0; 1063 adapter->intcounter = 0;
1065 1064