Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=56c4656e84d068ecc4da670799216e5b2aaee50e
Commit:     56c4656e84d068ecc4da670799216e5b2aaee50e
Parent:     252cf0d10f76d3edcd808d462dcfbd544875a0be
Author:     Holger Schurig <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 2 13:09:49 2007 -0400
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:50:03 2007 -0700

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 drivers/net/wireless/libertas/cmd.c  |    2 +-
 drivers/net/wireless/libertas/dev.h  |    1 -
 drivers/net/wireless/libertas/main.c |    1 -
 3 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/libertas/cmd.c 
b/drivers/net/wireless/libertas/cmd.c
index 276d981..517489a 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 cf4ed5d..0f383e3 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 c35605a..df06d40 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;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to