diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-21 23:43:51 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-21 23:43:51 +0400 |
| commit | 75c8ec71fb29ed59c4b9bda2f411ed3b09164cf7 (patch) | |
| tree | c1dfd91e624b48ccefa71db573d043b639fe088f /drivers/net/wireless/iwlwifi/dvm/mac80211.c | |
| parent | 1e60896fe07307baa5f3ca1a220dfa9792657352 (diff) | |
| parent | 77d2ece6fde80631193054edc9c9a3edad519565 (diff) | |
| download | linux-75c8ec71fb29ed59c4b9bda2f411ed3b09164cf7.tar.xz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm/mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/mac80211.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index c862c0906349..932ad357edbd 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c @@ -1035,6 +1035,7 @@ done: } static int iwlagn_mac_remain_on_channel(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, struct ieee80211_channel *channel, enum nl80211_channel_type channel_type, int duration) |