diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-04-23 20:43:45 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-23 20:43:45 +0200 |
| commit | 3b51cc996e81d8a113416d8094fa4a88f8360a51 (patch) | |
| tree | e75b98b228bb4e456c30673fcc4b56ffa1d09cf5 /net/mac80211/driver-ops.h | |
| parent | bnx2x: add support for receive hashing (diff) | |
| parent | radiotap parser: fix endian annotation (diff) | |
| download | linux-3b51cc996e81d8a113416d8094fa4a88f8360a51.tar.xz linux-3b51cc996e81d8a113416d8094fa4a88f8360a51.zip | |
Merge branch 'master' into for-davem
Conflicts:
drivers/net/wireless/ath/ath9k/phy.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-debugfs.c
Diffstat (limited to 'net/mac80211/driver-ops.h')
| -rw-r--r-- | net/mac80211/driver-ops.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h index 9179196da264..35e1e581e806 100644 --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h @@ -344,6 +344,15 @@ static inline int drv_ampdu_action(struct ieee80211_local *local, return ret; } +static inline int drv_get_survey(struct ieee80211_local *local, int idx, + struct survey_info *survey) +{ + int ret = -EOPNOTSUPP; + if (local->ops->conf_tx) + ret = local->ops->get_survey(&local->hw, idx, survey); + /* trace_drv_get_survey(local, idx, survey, ret); */ + return ret; +} static inline void drv_rfkill_poll(struct ieee80211_local *local) { |