From 12617f0e6a0be38415cb13ee42dedbac84ffbbc5 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Thu, 2 Apr 2009 14:08:07 -0400 Subject: [PATCH] --- yaml --- r: 149897 b: refs/heads/master c: a4ed90d60c39c5aef9a170d7693f61175acb22e0 h: refs/heads/master i: 149895: 11215228ec48bb38facc1f3ebaca39a85f77a69d v: v3 --- [refs] | 2 +- trunk/net/wireless/reg.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0f75f4a2caf2..28c7d6d6911c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3eb9296970e70902593b15ed3080e389954cf5f5 +refs/heads/master: a4ed90d60c39c5aef9a170d7693f61175acb22e0 diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index 6c1993d99902..4af4304cec3e 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -1070,12 +1070,14 @@ static void handle_reg_beacon(struct wiphy *wiphy, if (likely(chan->center_freq != reg_beacon->chan.center_freq)) return; - if (chan->flags & IEEE80211_CHAN_PASSIVE_SCAN) { + if ((chan->flags & IEEE80211_CHAN_PASSIVE_SCAN) && + !(chan->orig_flags & IEEE80211_CHAN_PASSIVE_SCAN)) { chan->flags &= ~IEEE80211_CHAN_PASSIVE_SCAN; REG_DEBUG_BEACON_FLAG("active scanning"); } - if (chan->flags & IEEE80211_CHAN_NO_IBSS) { + if ((chan->flags & IEEE80211_CHAN_NO_IBSS) && + !(chan->orig_flags & IEEE80211_CHAN_NO_IBSS)) { chan->flags &= ~IEEE80211_CHAN_NO_IBSS; REG_DEBUG_BEACON_FLAG("beaconing"); }