summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-08-02 13:11:19 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:50:06 -0700
commit85c93e5189b7402b4f9f4324c284bb91e8e8fb85 (patch)
tree24a3cdfe3f5ddc2cc316e2c193a262865420cbb0 /drivers/net
parent0aabc0a5d5657df254255c9049a97cc96229bcba (diff)
[PATCH] libertas: remove adapter->adhoc_grate_enabled
The variable was initialized with 0 (false). There is no code that would ever change it, so we can use the false-patch directly. Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/libertas/dev.h2
-rw-r--r--drivers/net/wireless/libertas/join.c9
-rw-r--r--drivers/net/wireless/libertas/main.c1
3 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 4738afa61e33..90e9405903ba 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -281,8 +281,6 @@ struct _wlan_adapter {
u16 enablehwauto;
u16 ratebitmap;
- /** control G rates */
- u8 adhoc_grate_enabled;
u32 fragthsd;
u32 rtsthsd;
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index e335a7e4adaa..95c21bae60f5 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -534,13 +534,8 @@ int libertas_cmd_80211_ad_hoc_start(wlan_private * priv,
adhs->probedelay = cpu_to_le16(CMD_SCAN_PROBE_DELAY_TIME);
memset(adhs->rates, 0, sizeof(adhs->rates));
- if (adapter->adhoc_grate_enabled) {
- ratesize = min(sizeof(adhs->rates), sizeof(libertas_bg_rates));
- memcpy(adhs->rates, libertas_bg_rates, ratesize);
- } else {
- ratesize = min(sizeof(adhs->rates), sizeof(adhoc_rates_b));
- memcpy(adhs->rates, adhoc_rates_b, ratesize);
- }
+ ratesize = min(sizeof(adhs->rates), sizeof(adhoc_rates_b));
+ memcpy(adhs->rates, adhoc_rates_b, ratesize);
/* Copy the ad-hoc creating rates into Current BSS state structure */
memset(&adapter->curbssparams.rates, 0, sizeof(adapter->curbssparams.rates));
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index d3316e413465..ab8dcbf5bfc9 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1042,7 +1042,6 @@ static void wlan_init_adapter(wlan_private * priv)
adapter->auto_rate = 1;
adapter->cur_rate = 0;
- adapter->adhoc_grate_enabled = 0;
adapter->beaconperiod = MRVDRV_BEACON_INTERVAL;