diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-04-14 13:47:01 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-04-14 13:47:01 -0400 |
| commit | 08e22e193a0080d53dd0669c4f6422f602bb643c (patch) | |
| tree | b85c76ba6466fce48bbce4500d49f142aa0bf263 /net/mac80211/offchannel.c | |
| parent | 321d03c86732e45f5f33ad0db5b68e2e1364acb9 (diff) | |
| parent | 764152ff66f4a8be1f9d7981e542ffdaa5bd7aff (diff) | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/mac80211/offchannel.c')
| -rw-r--r-- | net/mac80211/offchannel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index 0c2a29484c07..6fb38558a5e6 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c | |||
| @@ -355,6 +355,7 @@ void ieee80211_sw_roc_work(struct work_struct *work) | |||
| 355 | struct ieee80211_roc_work *dep; | 355 | struct ieee80211_roc_work *dep; |
| 356 | 356 | ||
| 357 | /* start this ROC */ | 357 | /* start this ROC */ |
| 358 | ieee80211_offchannel_stop_vifs(local); | ||
| 358 | 359 | ||
| 359 | /* switch channel etc */ | 360 | /* switch channel etc */ |
| 360 | ieee80211_recalc_idle(local); | 361 | ieee80211_recalc_idle(local); |