Skip to content

Commit

Permalink
[PATCH] libertas: remove adapter->adhoc_grate_enabled
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Holger Schurig authored and David S. Miller committed Oct 10, 2007
1 parent 0aabc0a commit 85c93e5
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 10 deletions.
2 changes: 0 additions & 2 deletions drivers/net/wireless/libertas/dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,8 +281,6 @@ struct _wlan_adapter {

u16 enablehwauto;
u16 ratebitmap;
/** control G rates */
u8 adhoc_grate_enabled;

u32 fragthsd;
u32 rtsthsd;
Expand Down
9 changes: 2 additions & 7 deletions drivers/net/wireless/libertas/join.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
1 change: 0 additions & 1 deletion drivers/net/wireless/libertas/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 85c93e5

Please sign in to comment.