summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-08-02 13:11:38 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:50:06 -0700
commit2c85103da3c88a06a7c01eece709482d85eff07f (patch)
tree7a4d065ae38f92b2b49a91943f1a1142d75b242c
parent85c93e5189b7402b4f9f4324c284bb91e8e8fb85 (diff)
downloadblackbird-op-linux-2c85103da3c88a06a7c01eece709482d85eff07f.tar.gz
blackbird-op-linux-2c85103da3c88a06a7c01eece709482d85eff07f.zip
[PATCH] libertas: remove adapter->beaconperiod
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>
-rw-r--r--drivers/net/wireless/libertas/dev.h1
-rw-r--r--drivers/net/wireless/libertas/join.c2
-rw-r--r--drivers/net/wireless/libertas/main.c2
3 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 90e9405903ba..602a93e88925 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -265,7 +265,6 @@ struct _wlan_adapter {
u8 scantype;
u32 scanmode;
- u16 beaconperiod;
u8 adhoccreate;
/** capability Info used in Association, start, join */
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index 95c21bae60f5..c16d1f625d1b 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -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
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index ab8dcbf5bfc9..1c8760ca8644 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -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;
OpenPOWER on IntegriCloud