[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>

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 72e76e4ec7a94740066eb26f26460f1d4fb679ee..f5d4971f13a0ab32808da68ef34f1adc38be3cc7 100644 (file)
--- 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,
 
                psm->locallisteninterval =
                    cpu_to_le16(adapter->locallisteninterval);
-               psm->nullpktinterval =
-                   cpu_to_le16(adapter->nullpktinterval);
+               psm->nullpktinterval = 0;
                psm->multipledtim =
                    cpu_to_le16(priv->adapter->multipledtim);
                break;

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