ソースを参照

[PATCH] libertas: remove adapter->locallisteninterval

locallisteninterval was initialized with 0, but there is no code that
changes it, rendering it rather useless.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Holger Schurig 18 年 前
コミット
252cf0d10f

+ 1 - 5
drivers/net/wireless/libertas/cmd.c

@@ -56,7 +56,6 @@ static int wlan_cmd_802_11_ps_mode(wlan_private * priv,
 				   u16 cmd_action)
 				   u16 cmd_action)
 {
 {
 	struct cmd_ds_802_11_ps_mode *psm = &cmd->params.psmode;
 	struct cmd_ds_802_11_ps_mode *psm = &cmd->params.psmode;
-	wlan_adapter *adapter = priv->adapter;
 
 
 	lbs_deb_enter(LBS_DEB_CMD);
 	lbs_deb_enter(LBS_DEB_CMD);
 
 
@@ -68,11 +67,8 @@ static int wlan_cmd_802_11_ps_mode(wlan_private * priv,
 	switch (cmd_action) {
 	switch (cmd_action) {
 	case CMD_SUBCMD_ENTER_PS:
 	case CMD_SUBCMD_ENTER_PS:
 		lbs_deb_cmd("PS command:" "SubCode- Enter PS\n");
 		lbs_deb_cmd("PS command:" "SubCode- Enter PS\n");
-		lbs_deb_cmd("locallisteninterval %d\n",
-		       adapter->locallisteninterval);
 
 
-		psm->locallisteninterval =
-		    cpu_to_le16(adapter->locallisteninterval);
+		psm->locallisteninterval = 0;
 		psm->nullpktinterval = 0;
 		psm->nullpktinterval = 0;
 		psm->multipledtim =
 		psm->multipledtim =
 		    cpu_to_le16(priv->adapter->multipledtim);
 		    cpu_to_le16(priv->adapter->multipledtim);

+ 0 - 1
drivers/net/wireless/libertas/dev.h

@@ -312,7 +312,6 @@ struct _wlan_adapter {
 	u8 needtowakeup;
 	u8 needtowakeup;
 
 
 	struct PS_CMD_ConfirmSleep libertas_ps_confirm_sleep;
 	struct PS_CMD_ConfirmSleep libertas_ps_confirm_sleep;
-	u16 locallisteninterval;
 
 
 	struct assoc_request * pending_assoc_req;
 	struct assoc_request * pending_assoc_req;
 	struct assoc_request * in_progress_assoc_req;
 	struct assoc_request * in_progress_assoc_req;

+ 0 - 1
drivers/net/wireless/libertas/main.c

@@ -1059,7 +1059,6 @@ static void wlan_init_adapter(wlan_private * priv)
 
 
 	adapter->psstate = PS_STATE_FULL_POWER;
 	adapter->psstate = PS_STATE_FULL_POWER;
 	adapter->needtowakeup = 0;
 	adapter->needtowakeup = 0;
-	adapter->locallisteninterval = 0;	/* default value in firmware will be used */
 
 
 	adapter->intcounter = 0;
 	adapter->intcounter = 0;