diff options
author | Holger Schurig <hs4233@mail.mn-solutions.de> | 2007-08-02 13:09:15 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:50:02 -0400 |
commit | 97605c3eb3dee943a45584be92c46be1305b3ef5 (patch) | |
tree | 23a72cd969a84ef9e12ca8e32b263c77b1e59133 | |
parent | a783f1ee5b112a0258762877ec7c1ce8810f3cd8 (diff) |
[PATCH] libertas: remove adapter->nullpktinterval
No code ever initialized this variable, so it was 0 because of kzalloc().
But no other code changes it, making 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.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/dev.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c index 72e76e4ec7a..f5d4971f13a 100644 --- a/drivers/net/wireless/libertas/cmd.c +++ b/drivers/net/wireless/libertas/cmd.c | |||
@@ -73,8 +73,7 @@ static int wlan_cmd_802_11_ps_mode(wlan_private * priv, | |||
73 | 73 | ||
74 | psm->locallisteninterval = | 74 | psm->locallisteninterval = |
75 | cpu_to_le16(adapter->locallisteninterval); | 75 | cpu_to_le16(adapter->locallisteninterval); |
76 | psm->nullpktinterval = | 76 | psm->nullpktinterval = 0; |
77 | cpu_to_le16(adapter->nullpktinterval); | ||
78 | psm->multipledtim = | 77 | psm->multipledtim = |
79 | cpu_to_le16(priv->adapter->multipledtim); | 78 | cpu_to_le16(priv->adapter->multipledtim); |
80 | break; | 79 | break; |
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h index 76234000e5b..6e78e315a8b 100644 --- a/drivers/net/wireless/libertas/dev.h +++ b/drivers/net/wireless/libertas/dev.h | |||
@@ -313,7 +313,6 @@ struct _wlan_adapter { | |||
313 | 313 | ||
314 | struct PS_CMD_ConfirmSleep libertas_ps_confirm_sleep; | 314 | struct PS_CMD_ConfirmSleep libertas_ps_confirm_sleep; |
315 | u16 locallisteninterval; | 315 | u16 locallisteninterval; |
316 | u16 nullpktinterval; | ||
317 | 316 | ||
318 | struct assoc_request * pending_assoc_req; | 317 | struct assoc_request * pending_assoc_req; |
319 | struct assoc_request * in_progress_assoc_req; | 318 | struct assoc_request * in_progress_assoc_req; |