Skip to content

Commit

Permalink
[PATCH] libertas: remove adapter->beaconperiod
Browse files Browse the repository at this point in the history
beaconperiod was initialized with MRVDRV_BEACON_INTERVAL, but there is
no code that would ever change it's value. We can use the 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 85c93e5 commit 2c85103
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 @@ -265,7 +265,6 @@ struct _wlan_adapter {
u8 scantype;
u32 scanmode;

u16 beaconperiod;
u8 adhoccreate;

/** capability Info used in Association, start, join */
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 @@ -496,7 +496,7 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
/* set the BSS type */
adhs->bsstype = CMD_BSS_TYPE_IBSS;
adapter->mode = IW_MODE_ADHOC;
adhs->beaconperiod = cpu_to_le16(adapter->beaconperiod);
adhs->beaconperiod = cpu_to_le16(MRVDRV_BEACON_INTERVAL);

/* set Physical param set */
#define DS_PARA_IE_ID 3
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 @@ -1043,8 +1043,6 @@ static void wlan_init_adapter(wlan_private * priv)
adapter->auto_rate = 1;
adapter->cur_rate = 0;

adapter->beaconperiod = MRVDRV_BEACON_INTERVAL;

// set default capabilities
adapter->capability = WLAN_CAPABILITY_SHORT_PREAMBLE;

Expand Down

0 comments on commit 2c85103

Please sign in to comment.