diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-26 15:03:48 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-26 15:03:48 -0400 |
| commit | d9b8ae6bd8c3304569a25079fcdbebaa28a48ee4 (patch) | |
| tree | 9ce3e4eb355685f970dd7333a0a935109aff0583 /include/net | |
| parent | 872f24dbc604ef585ea7eec73020dcdfaffd1956 (diff) | |
| parent | 94c514fe240fc0dd02187b78facefde8b6744634 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-testmode.c
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/mac80211.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index bebd89f7f6c3..da3658177997 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h | |||
| @@ -3802,6 +3802,14 @@ int ieee80211_add_srates_ie(struct ieee80211_vif *vif, | |||
| 3802 | int ieee80211_add_ext_srates_ie(struct ieee80211_vif *vif, | 3802 | int ieee80211_add_ext_srates_ie(struct ieee80211_vif *vif, |
| 3803 | struct sk_buff *skb, bool need_basic); | 3803 | struct sk_buff *skb, bool need_basic); |
| 3804 | 3804 | ||
| 3805 | /** | ||
| 3806 | * ieee80211_ave_rssi - report the average rssi for the specified interface | ||
| 3807 | * | ||
| 3808 | * @vif: the specified virtual interface | ||
| 3809 | * | ||
| 3810 | * This function return the average rssi value for the requested interface. | ||
| 3811 | * It assumes that the given vif is valid. | ||
| 3812 | */ | ||
| 3805 | int ieee80211_ave_rssi(struct ieee80211_vif *vif); | 3813 | int ieee80211_ave_rssi(struct ieee80211_vif *vif); |
| 3806 | 3814 | ||
| 3807 | #endif /* MAC80211_H */ | 3815 | #endif /* MAC80211_H */ |