From 49bd82c4a57186a857c94f6951a6a737ea4b6b69 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 18 Oct 2011 13:39:14 +0200 Subject: [PATCH] --- yaml --- r: 277605 b: refs/heads/master c: ef5af74707e1921f9462e2cfeb336a21af6ae902 h: refs/heads/master i: 277603: 4c739382fcd792bd123d2c31447f36214eb0f04c v: v3 --- [refs] | 2 +- trunk/net/mac80211/cfg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 138f6f49c0c6..edad5487a69f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a5ee76e09b1f5a3a550127aecc2ea4d59f17963 +refs/heads/master: ef5af74707e1921f9462e2cfeb336a21af6ae902 diff --git a/trunk/net/mac80211/cfg.c b/trunk/net/mac80211/cfg.c index ebd7fb101fbf..000a8ba987cd 100644 --- a/trunk/net/mac80211/cfg.c +++ b/trunk/net/mac80211/cfg.c @@ -1394,7 +1394,7 @@ static int ieee80211_set_channel(struct wiphy *wiphy, (old_oper_type != local->_oper_channel_type)) ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL); - if ((sdata && sdata->vif.type != NL80211_IFTYPE_MONITOR) && + if (sdata && sdata->vif.type != NL80211_IFTYPE_MONITOR && old_vif_oper_type != sdata->vif.bss_conf.channel_type) ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_HT);