diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-03-26 10:35:50 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-26 10:35:50 +0100 |
| commit | b510446b643572903535c3b1d3e63e9cfa4e94d9 (patch) | |
| tree | 9948562b6e050f5722663d2436835787e3e22504 /drivers/net/wireless/iwlwifi | |
| parent | 8c6e83d6d3e522bba314225863ff323991d514f7 (diff) | |
| parent | 64513ef449e3beaacb801d41467f47642683e35a (diff) | |
| download | op-kernel-dev-b510446b643572903535c3b1d3e63e9cfa4e94d9.zip op-kernel-dev-b510446b643572903535c3b1d3e63e9cfa4e94d9.tar.gz | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi')
| -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 c7cd2df..a7294fa 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, FIF_BCN_PRBRESP_PROMISC | FIF_CONTROL; } -static void iwlagn_mac_flush(struct ieee80211_hw *hw, bool drop) +static void iwlagn_mac_flush(struct ieee80211_hw *hw, u32 queues, bool drop) { struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw); |
