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

diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 276d981e7d3dcbc27cc69e0edcde57b97596c37c..517489a06063c0dcb39a0644d3737bae3e7a6765 100644 (file)
--- 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 cf4ed5d0145854737d61bc35d8d387ab2fad638a..0f383e3f6f0652148747adf96f8a7c4749ad5f6c 100644 (file)
--- 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 c35605acf82092fe1337400fe6afd889aad69341..df06d40ffdea2684d9f3350794fd06b9744c2d0b 100644 (file)
--- 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;