diff options
| author | David S. Miller <davem@davemloft.net> | 2012-03-28 02:15:01 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-28 02:15:01 (GMT) |
| commit | 7dd30d447b7f4a129586cce8e57d0163dde876b0 (patch) | |
| tree | f6a3c26bccbd31e144c8c68fda979988739d4af5 /net/mac80211/main.c | |
| parent | de8856d2c11f562c60ed9340a83db4a4f829a6e6 (diff) | |
| parent | 643c61e119459e9d750087b7b34be94491efebf9 (diff) | |
| download | linux-fsl-qoriq-7dd30d447b7f4a129586cce8e57d0163dde876b0.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/main.c')
| -rw-r--r-- | net/mac80211/main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index b581a24..1633648 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -102,9 +102,6 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed) might_sleep(); - /* If this off-channel logic ever changes, ieee80211_on_oper_channel - * may need to change as well. - */ offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL; if (local->scan_channel) { chan = local->scan_channel; |