diff --git a/[refs] b/[refs] index e5879734b8f6..4697d6bf2118 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5447ff92b5169eab843a76d83e98d0cd7b7f5b6 +refs/heads/master: b603c03e9534b9bec19ebf8c42bf217fd875ee65 diff --git a/trunk/net/mac80211/main.c b/trunk/net/mac80211/main.c index b581a24fa15c..16336480c631 100644 --- a/trunk/net/mac80211/main.c +++ b/trunk/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;