diff options
| author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-11-03 10:40:47 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-09 16:01:01 -0500 |
| commit | 4fdbff0770bea059621bc4906fb7c7f5879f3ae1 (patch) | |
| tree | 2987e261cbc2b0a0b6c528c8c96d2d9e9700e2fd | |
| parent | 0b62ffb53c9732e02ec77ae795f1e03cb2f2d406 (diff) | |
| download | lwn-4fdbff0770bea059621bc4906fb7c7f5879f3ae1.tar.gz lwn-4fdbff0770bea059621bc4906fb7c7f5879f3ae1.zip | |
mac80211: simplify ieee80211_work_work
Since local->tmp_channel is always NULL in one branch, some code paths
will newer be taken in that branch, so remove them.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/mac80211/work.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/net/mac80211/work.c b/net/mac80211/work.c index 30da4e3f19f7..3dd5a89e99a7 100644 --- a/net/mac80211/work.c +++ b/net/mac80211/work.c @@ -942,10 +942,9 @@ static void ieee80211_work_work(struct work_struct *work) } if (!started && !local->tmp_channel) { - bool on_oper_chan; - bool tmp_chan_changed = false; - bool on_oper_chan2; + bool on_oper_chan, on_oper_chan2; enum nl80211_channel_type wk_ct; + on_oper_chan = ieee80211_cfg_on_oper_channel(local); /* Work with existing channel type if possible. */ @@ -954,11 +953,6 @@ static void ieee80211_work_work(struct work_struct *work) wk_ct = ieee80211_calc_ct(wk->chan_type, local->hw.conf.channel_type); - if (local->tmp_channel) - if ((local->tmp_channel != wk->chan) || - (local->tmp_channel_type != wk_ct)) - tmp_chan_changed = true; - local->tmp_channel = wk->chan; local->tmp_channel_type = wk_ct; /* @@ -981,12 +975,7 @@ static void ieee80211_work_work(struct work_struct *work) true, false); } - } else if (tmp_chan_changed) - /* Still off-channel, but on some other - * channel, so update hardware. - * PS should already be off-channel. - */ - ieee80211_hw_config(local, 0); + } started = true; wk->timeout = jiffies; |