diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-23 14:34:00 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-23 14:34:00 -0500 |
| commit | e91d1694d362f065c51eb07b46b19e8b33c92777 (patch) | |
| tree | 35d67945915b202026680a62438e07d3241ba6a2 /net/mac80211/ieee80211_i.h | |
| parent | 5d0feaff230c0abfe4a112e6f09f096ed99e0b2d (diff) | |
| parent | 83f0c6d1f502bd75bb4a9e31e8d64e59c6894ad1 (diff) | |
| download | linux-e91d1694d362f065c51eb07b46b19e8b33c92777.tar.gz linux-e91d1694d362f065c51eb07b46b19e8b33c92777.tar.bz2 linux-e91d1694d362f065c51eb07b46b19e8b33c92777.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 8563b9a5cac3..2ed065c09562 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1358,10 +1358,8 @@ int ieee80211_request_sched_scan_stop(struct ieee80211_sub_if_data *sdata); void ieee80211_sched_scan_stopped_work(struct work_struct *work); /* off-channel helpers */ -void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local, - bool offchannel_ps_enable); -void ieee80211_offchannel_return(struct ieee80211_local *local, - bool offchannel_ps_disable); +void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local); +void ieee80211_offchannel_return(struct ieee80211_local *local); void ieee80211_roc_setup(struct ieee80211_local *local); void ieee80211_start_next_roc(struct ieee80211_local *local); void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata); |