Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0aabc0a5 authored by Holger Schurig's avatar Holger Schurig Committed by David S. Miller
Browse files

[PATCH] libertas: remove adapter->listeninterval 



listeninterval was initialized with MRVDRV_DEFAULT_LISTEN_INTERVAL, but
there exists that would ever change it. So we can use this define directly.

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 956deb86

drivers/net/wireless/libertas/dev.h

+0 −1
Original line number Diff line number Diff line
@@ -287,7 +287,6 @@ struct _wlan_adapter { 
	u32 fragthsd;

	u32 rtsthsd;



	u16 listeninterval;

	u8 txretrycount;



	/** Tx-related variables (for single packet tx) */

drivers/net/wireless/libertas/join.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ int libertas_cmd_80211_associate(wlan_private * priv, 
	pos += sizeof(passo->peerstaaddr);



	/* set the listen interval */

	passo->listeninterval = cpu_to_le16(adapter->listeninterval);

	passo->listeninterval = cpu_to_le16(MRVDRV_DEFAULT_LISTEN_INTERVAL);



	pos += sizeof(passo->capability);

	pos += sizeof(passo->listeninterval);

drivers/net/wireless/libertas/main.c

+0 −2
Original line number Diff line number Diff line
@@ -1051,8 +1051,6 @@ static void wlan_init_adapter(wlan_private * priv) 


	adapter->psmode = WLAN802_11POWERMODECAM;



	adapter->listeninterval = MRVDRV_DEFAULT_LISTEN_INTERVAL;



	adapter->psstate = PS_STATE_FULL_POWER;

	adapter->needtowakeup = 0;