diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-06-12 15:39:05 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-06-12 15:39:05 -0400 |
commit | 812fd645968118c35a3f4d0d18dd3f4d07221df0 (patch) | |
tree | b68ee223f22a811e9743b193872052cd264fe2d0 /net/mac80211/util.c | |
parent | cb180840a0c6bff7c0787373c23cefdf20417a27 (diff) | |
parent | 940d0ac9dbe3fb9d4806e96f006286c2e476deed (diff) | |
download | op-kernel-dev-812fd645968118c35a3f4d0d18dd3f4d07221df0.zip op-kernel-dev-812fd645968118c35a3f4d0d18dd3f4d07221df0.tar.gz |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r-- | net/mac80211/util.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 89a8377..5a6c135 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1584,8 +1584,9 @@ int ieee80211_reconfig(struct ieee80211_local *local) BSS_CHANGED_ARP_FILTER | BSS_CHANGED_PS; - if (sdata->u.mgd.dtim_period) - changed |= BSS_CHANGED_DTIM_PERIOD; + /* Re-send beacon info report to the driver */ + if (sdata->u.mgd.have_beacon) + changed |= BSS_CHANGED_BEACON_INFO; sdata_lock(sdata); ieee80211_bss_info_change_notify(sdata, changed); |