diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-04-30 12:04:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-04-30 12:04:27 -0400 |
| commit | f6595444c1ee798f9c227107bb3ab14730c6497a (patch) | |
| tree | e8e06d7c2057c69e19848ee3abd6720927f5f9f9 /net/mac80211/mlme.c | |
| parent | 0006433a5be9e0e155ad493e33c6e9bf3868a87f (diff) | |
| parent | f55ee0834247c88cb6981cb11eb1870392878371 (diff) | |
| download | linux-f6595444c1ee798f9c227107bb3ab14730c6497a.tar.gz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts: net/mac80211/chan.c
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index dee50aefd6e8..488826f188a7 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -1089,7 +1089,7 @@ ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, } chanctx = container_of(rcu_access_pointer(sdata->vif.chanctx_conf), struct ieee80211_chanctx, conf); - if (chanctx->refcount > 1) { + if (ieee80211_chanctx_refcount(local, chanctx) > 1) { sdata_info(sdata, "channel switch with multiple interfaces on the same channel, disconnecting\n"); ieee80211_queue_work(&local->hw, @@ -3701,7 +3701,7 @@ int ieee80211_max_network_latency(struct notifier_block *nb, ieee80211_recalc_ps(local, latency_usec); mutex_unlock(&local->iflist_mtx); - return 0; + return NOTIFY_OK; } static u8 ieee80211_ht_vht_rx_chains(struct ieee80211_sub_if_data *sdata, |