projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'wireless-next/master' into HEAD
[linux-block.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
dvm
/
mac80211.c
diff --git
a/drivers/net/wireless/iwlwifi/dvm/mac80211.c
b/drivers/net/wireless/iwlwifi/dvm/mac80211.c
index 0353e1c0670d8b087a959b2ccec4d107c9f30309..fa43c0d6abe295aa96428c4b27e3c6d1737542c1 100644
(file)
--- a/
drivers/net/wireless/iwlwifi/dvm/mac80211.c
+++ b/
drivers/net/wireless/iwlwifi/dvm/mac80211.c
@@
-1154,6
+1154,7
@@
static int iwlagn_mac_cancel_remain_on_channel(struct ieee80211_hw *hw)
}
static void iwlagn_mac_rssi_callback(struct ieee80211_hw *hw,
+ struct ieee80211_vif *vif,
enum ieee80211_rssi_event rssi_event)
{
struct iwl_priv *priv = IWL_MAC80211_GET_DVM(hw);