瀏覽代碼

[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>
Holger Schurig 18 年之前
父節點
當前提交
85c93e5189
共有 3 個文件被更改,包括 2 次插入10 次删除
  1. 0 2
      drivers/net/wireless/libertas/dev.h
  2. 2 7
      drivers/net/wireless/libertas/join.c
  3. 0 1
      drivers/net/wireless/libertas/main.c

+ 0 - 2
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;

+ 2 - 7
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));

+ 0 - 1
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;