diff options
author | Johannes Berg <johannes.berg@intel.com> | 2014-01-29 09:23:46 -0500 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-04 15:58:14 -0500 |
commit | 953467d32150e2ae15aa3d5396ada175d265a412 (patch) | |
tree | e38ffa7b99e16f70c45c025128799b52ab0df629 /net | |
parent | e3961af1e928a1195204a3e87cf179315c5c4990 (diff) |
mac80211: remove set but unused variables
Compiling with W=1 found a few variables that are set
but not used (-Wunused-but-set-variable), remove them.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/ibss.c | 3 | ||||
-rw-r--r-- | net/mac80211/status.c | 3 | ||||
-rw-r--r-- | net/mac80211/util.c | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 531477a62f4b..8e444476307a 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c | |||
@@ -220,7 +220,6 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, | |||
220 | { | 220 | { |
221 | struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; | 221 | struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; |
222 | struct ieee80211_local *local = sdata->local; | 222 | struct ieee80211_local *local = sdata->local; |
223 | struct ieee80211_supported_band *sband; | ||
224 | struct ieee80211_mgmt *mgmt; | 223 | struct ieee80211_mgmt *mgmt; |
225 | struct cfg80211_bss *bss; | 224 | struct cfg80211_bss *bss; |
226 | u32 bss_change; | 225 | u32 bss_change; |
@@ -307,8 +306,6 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, | |||
307 | 306 | ||
308 | memcpy(ifibss->bssid, bssid, ETH_ALEN); | 307 | memcpy(ifibss->bssid, bssid, ETH_ALEN); |
309 | 308 | ||
310 | sband = local->hw.wiphy->bands[chan->band]; | ||
311 | |||
312 | presp = ieee80211_ibss_build_presp(sdata, beacon_int, basic_rates, | 309 | presp = ieee80211_ibss_build_presp(sdata, beacon_int, basic_rates, |
313 | capability, tsf, &chandef, | 310 | capability, tsf, &chandef, |
314 | &have_higher_than_11mbit, NULL); | 311 | &have_higher_than_11mbit, NULL); |
diff --git a/net/mac80211/status.c b/net/mac80211/status.c index 1ee85c402439..e6e574a307c8 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c | |||
@@ -479,7 +479,7 @@ static void ieee80211_tx_latency_end_msrmnt(struct ieee80211_local *local, | |||
479 | u32 msrmnt; | 479 | u32 msrmnt; |
480 | u16 tid; | 480 | u16 tid; |
481 | u8 *qc; | 481 | u8 *qc; |
482 | int i, bin_range_count, bin_count; | 482 | int i, bin_range_count; |
483 | u32 *bin_ranges; | 483 | u32 *bin_ranges; |
484 | __le16 fc; | 484 | __le16 fc; |
485 | struct ieee80211_tx_latency_stat *tx_lat; | 485 | struct ieee80211_tx_latency_stat *tx_lat; |
@@ -522,7 +522,6 @@ static void ieee80211_tx_latency_end_msrmnt(struct ieee80211_local *local, | |||
522 | /* count how many Tx frames transmitted with the appropriate latency */ | 522 | /* count how many Tx frames transmitted with the appropriate latency */ |
523 | bin_range_count = tx_latency->n_ranges; | 523 | bin_range_count = tx_latency->n_ranges; |
524 | bin_ranges = tx_latency->ranges; | 524 | bin_ranges = tx_latency->ranges; |
525 | bin_count = tx_lat->bin_count; | ||
526 | 525 | ||
527 | for (i = 0; i < bin_range_count; i++) { | 526 | for (i = 0; i < bin_range_count; i++) { |
528 | if (msrmnt <= bin_ranges[i]) { | 527 | if (msrmnt <= bin_ranges[i]) { |
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 128a0c57a0d3..503bbced21f0 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c | |||
@@ -1374,7 +1374,6 @@ u32 ieee80211_sta_get_rates(struct ieee80211_sub_if_data *sdata, | |||
1374 | enum ieee80211_band band, u32 *basic_rates) | 1374 | enum ieee80211_band band, u32 *basic_rates) |
1375 | { | 1375 | { |
1376 | struct ieee80211_supported_band *sband; | 1376 | struct ieee80211_supported_band *sband; |
1377 | struct ieee80211_rate *bitrates; | ||
1378 | size_t num_rates; | 1377 | size_t num_rates; |
1379 | u32 supp_rates, rate_flags; | 1378 | u32 supp_rates, rate_flags; |
1380 | int i, j, shift; | 1379 | int i, j, shift; |
@@ -1386,7 +1385,6 @@ u32 ieee80211_sta_get_rates(struct ieee80211_sub_if_data *sdata, | |||
1386 | if (WARN_ON(!sband)) | 1385 | if (WARN_ON(!sband)) |
1387 | return 1; | 1386 | return 1; |
1388 | 1387 | ||
1389 | bitrates = sband->bitrates; | ||
1390 | num_rates = sband->n_bitrates; | 1388 | num_rates = sband->n_bitrates; |
1391 | supp_rates = 0; | 1389 | supp_rates = 0; |
1392 | for (i = 0; i < elems->supp_rates_len + | 1390 | for (i = 0; i < elems->supp_rates_len + |