summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorPaul Stewart <pstew@chromium.org>2012-08-01 16:54:42 -0700
committerJohannes Berg <johannes.berg@intel.com>2012-08-02 15:34:22 +0200
commit899852af60c212bfe9a2fb71d4d9082d2622df5c (patch)
tree2327783f8779d3267c8d310521973b4b4d600d3d /net/wireless
parent03f6b0843ad6512f27bc2e48f04c21065311e03e (diff)
cfg80211: Clear "beacon_found" on regulatory restore
Restore the default state to the "beacon_found" flag when the channel flags are restored. Otherwise, we can end up with a channel that we can no longer transmit on even when we can see beacons on that channel. Signed-off-by: Paul Stewart <pstew@chromium.org> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/reg.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index cbf30de79c6..2ded3c7fad0 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1901,6 +1901,7 @@ static void restore_custom_reg_settings(struct wiphy *wiphy)
chan->flags = chan->orig_flags;
chan->max_antenna_gain = chan->orig_mag;
chan->max_power = chan->orig_mpwr;
+ chan->beacon_found = false;
}
}
}