diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-30 14:22:19 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-30 14:22:19 -0500 |
| commit | 20fb9e50338199d9e88512703af4c560ab53bad4 (patch) | |
| tree | 2d0913749141e9e8e0df774426a658b52fddabbf /drivers/net/wireless/iwlwifi/dvm/mac80211.c | |
| parent | 0f496df2d9ba48faa808b5fa330de0da1a2d29d7 (diff) | |
| parent | 3b4797bce0050570e84bedd10e1b14e9320a3551 (diff) | |
| download | linux-stable-20fb9e50338199d9e88512703af4c560ab53bad4.tar.gz linux-stable-20fb9e50338199d9e88512703af4c560ab53bad4.tar.bz2 linux-stable-20fb9e50338199d9e88512703af4c560ab53bad4.zip | |
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 0353e1c0670d..fa43c0d6abe2 100644 --- 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); |