diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-12-06 15:50:45 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-06 15:50:45 +0100 |
| commit | e08fd975bf26aa8063cadd245817e042f570472d (patch) | |
| tree | 2b2a705710e6374cc037f89bcc7bfc25047485ba /net/mac80211/util.c | |
| parent | ath: fix dynamic user regulatory domain support (diff) | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber... (diff) | |
| download | linux-e08fd975bf26aa8063cadd245817e042f570472d.tar.xz linux-e08fd975bf26aa8063cadd245817e042f570472d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/brcm80211/Kconfig
net/mac80211/util.c
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 06265d7f8cc3..875e172c001c 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -2301,17 +2301,15 @@ void ieee80211_dfs_radar_detected_work(struct work_struct *work) { struct ieee80211_local *local = container_of(work, struct ieee80211_local, radar_detected_work); - struct cfg80211_chan_def chandef; + struct cfg80211_chan_def chandef = local->hw.conf.chandef; ieee80211_dfs_cac_cancel(local); if (local->use_chanctx) /* currently not handled */ WARN_ON(1); - else { - chandef = local->hw.conf.chandef; + else cfg80211_radar_event(local->hw.wiphy, &chandef, GFP_KERNEL); - } } void ieee80211_radar_detected(struct ieee80211_hw *hw) @@ -2481,13 +2479,8 @@ int ieee80211_send_action_csa(struct ieee80211_sub_if_data *sdata, WLAN_EID_CHAN_SWITCH_PARAM_TX_RESTRICT : 0x00; put_unaligned_le16(WLAN_REASON_MESH_CHAN, pos); /* Reason Cd */ pos += 2; - if (!ifmsh->pre_value) - ifmsh->pre_value = 1; - else - ifmsh->pre_value++; put_unaligned_le16(ifmsh->pre_value, pos);/* Precedence Value */ pos += 2; - ifmsh->chsw_init = true; } ieee80211_tx_skb(sdata, skb); |