2014-05-20 20:23:56

by Antonio Quartulli

Subject: [PATCH] mac80211: remove unused variables

From: Antonio Quartulli <[email protected]>

9dbd32e7dd9600b03c5a955980205446f3db0dfb accidentally
introduced two variables that are assigned but never used.

Remove them.

Signed-off-by: Antonio Quartulli <[email protected]>
---
net/mac80211/cfg.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index 9e86dd5..d7513a5 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -473,8 +473,6 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
struct ieee80211_sub_if_data *sdata = sta->sdata;
struct ieee80211_local *local = sdata->local;
struct rate_control_ref *ref = local->rate_ctrl;
- struct ieee80211_supported_band *sband;
- enum ieee80211_band band;
struct timespec uptime;
u64 packets = 0;
u32 thr = 0;
@@ -593,14 +591,10 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo)
sinfo->sta_flags.set |= BIT(NL80211_STA_FLAG_TDLS_PEER);

/* check if the driver has a SW RC implementation */
- if (ref && ref->ops->get_expected_throughput) {
- band = ieee80211_get_sdata_band(sta->sdata);
- sband = sta->local->hw.wiphy->bands[band];
-
+ if (ref && ref->ops->get_expected_throughput)
thr = ref->ops->get_expected_throughput(sta->rate_ctrl_priv);
- } else {
+ else
thr = drv_get_expected_throughput(local, &sta->sta);
- }

if (thr != 0) {
sinfo->filled |= STATION_INFO_EXPECTED_THROUGHPUT;
--
1.8.5.5

2014-05-21 15:50:38

by Johannes Berg

Subject: Re: [PATCH] mac80211: remove unused variables

On Tue, 2014-05-20 at 22:22 +0200, Antonio Quartulli wrote:
> From: Antonio Quartulli <[email protected]>
>
> 9dbd32e7dd9600b03c5a955980205446f3db0dfb accidentally

What? such commit doesn't exist ;-)

I squashed this in (this morning actually, but forgot to send an email)

johannes