[PATCH] libertas: remove adapter->multipledtim

multipledtim was initialized with MRVDRV_DEFAULT_MULTIPLE_DTIM and then
kept at that value, so we could use that define directly.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 1 insertions, 3 deletions

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 276d981e7d3d..517489a06063 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -71,7 +71,7 @@ static int wlan_cmd_802_11_ps_mode(wlan_private * priv,
                 psm->locallisteninterval = 0;
                 psm->nullpktinterval = 0;
                 psm->multipledtim =
-                    cpu_to_le16(priv->adapter->multipledtim);
+                    cpu_to_le16(MRVDRV_DEFAULT_MULTIPLE_DTIM);
                 break;
 
         case CMD_SUBCMD_EXIT_PS:
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index cf4ed5d01458..0f383e3f6f06 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -307,7 +307,6 @@ struct _wlan_adapter {
 
         u16 psmode;             /* Wlan802_11PowermodeCAM=disable
                                    Wlan802_11PowermodeMAX_PSP=enable */
-        u16 multipledtim;
         u32 psstate;
         u8 needtowakeup;
 
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index c35605acf820..df06d40ffdea 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1053,7 +1053,6 @@ static void wlan_init_adapter(wlan_private * priv)
         adapter->capability = WLAN_CAPABILITY_SHORT_PREAMBLE;
 
         adapter->psmode = WLAN802_11POWERMODECAM;
-        adapter->multipledtim = MRVDRV_DEFAULT_MULTIPLE_DTIM;
 
         adapter->listeninterval = MRVDRV_DEFAULT_LISTEN_INTERVAL;