---

yaml --- r: 66482 b: refs/heads/master c: 85c93e5 h: refs/heads/master v: v3
git-mirror · Oct 10, 2007 · 9fc29db · 9fc29db
1 parent fbcceed
commit 9fc29db
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0aabc0a5d5657df254255c9049a97cc96229bcba
+refs/heads/master: 85c93e5189b7402b4f9f4324c284bb91e8e8fb85
diff --git a/trunk/drivers/net/wireless/libertas/dev.h b/trunk/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/trunk/drivers/net/wireless/libertas/join.c b/trunk/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/trunk/drivers/net/wireless/libertas/main.c b/trunk/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;