diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-03-25 16:38:02 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-03-25 16:38:02 -0400 |
| commit | c78b3841fac9a59c7494be143aa7f2e69ea47958 (patch) | |
| tree | 503c1279d2bdf8b295ba7d2eb81830c5eb6bfb32 /drivers/net/wireless/iwlwifi/dvm | |
| parent | 0d4e67174b03e3dcfe75ce7ec488770a5d443bf4 (diff) | |
| parent | f00f188f8212fec9976394976c4fd5d4a3bc4dcf (diff) | |
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')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/mac80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/mac80211.c b/drivers/net/wireless/iwlwifi/dvm/mac80211.c index c7cd2dffa5cd..a7294fa4d7e5 100644 --- a/drivers/net/wireless/iwlwifi/dvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/dvm/mac80211.c | |||
| @@ -1100,7 +1100,7 @@ static void iwlagn_configure_filter(struct ieee80211_hw *hw, | |||
| 1100 | FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL; | 1100 | FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL; |
| 1101 | } | 1101 | } |
| 1102 | 1102 | ||
| 1103 | static void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop) | 1103 | static void iwlagn_mac_flush(struct ieee80211_hw *hw, u32 queues, bool drop) |
| 1104 | { | 1104 | { |
| 1105 | struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw); | 1105 | struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw); |
| 1106 | 1106 | ||