---

yaml --- r: 66478 b: refs/heads/master c: 56c4656 h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · 30136c4 · 30136c4
1 parent 4234077
commit 30136c4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 252cf0d10f76d3edcd808d462dcfbd544875a0be
+refs/heads/master: 56c4656e84d068ecc4da670799216e5b2aaee50e
diff --git a/trunk/drivers/net/wireless/libertas/cmd.c b/trunk/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/trunk/drivers/net/wireless/libertas/dev.h b/trunk/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/trunk/drivers/net/wireless/libertas/main.c b/trunk/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;