Skip to content

Commit

Permalink
[PATCH] libertas: remove adapter->listeninterval
Browse files Browse the repository at this point in the history
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: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Holger Schurig authored and David S. Miller committed Oct 10, 2007
1 parent 956deb8 commit 0aabc0a
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
1 change: 0 additions & 1 deletion drivers/net/wireless/libertas/dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,6 @@ struct _wlan_adapter {
u32 fragthsd;
u32 rtsthsd;

u16 listeninterval;
u8 txretrycount;

/** Tx-related variables (for single packet tx) */
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/wireless/libertas/join.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions drivers/net/wireless/libertas/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 0aabc0a

Please sign in to comment.