From 0bf2fdf0aa084ffc4f04033ab33ae09f2c3f1e0d Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Sun, 18 Mar 2012 14:08:50 +0200 Subject: [PATCH] --- yaml --- r: 298439 b: refs/heads/master c: b603c03e9534b9bec19ebf8c42bf217fd875ee65 h: refs/heads/master i: 298437: 5d5d6bbd0090c0fe54a244f7482038bf561d78bd 298435: 23667a5baa3d9ad0aaa48ab82f1e1a073e58d480 298431: 741b97076074b78a07de8d0783071f9a9cfc5a29 v: v3 --- [refs] | 2 +- trunk/net/mac80211/main.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) 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;