diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-14 20:45:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-14 20:45:59 -0500 |
| commit | f6f223039c0d0683bdea1eabd35b309e10311a60 (patch) | |
| tree | 890e07acf8c18ddc2994ebc0a0bdcdda38b0dcc6 /drivers/net/wireless/rt2x00/rt2x00.h | |
| parent | b3b3f04fb587ecb61b5baa6c1c5f0e666fd12d73 (diff) | |
| parent | 42c4568a4ace0adc27a9d6f02936e2047ba6fc7e (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00.h')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index 096da85a66f..43b70c6e4e9 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
| @@ -1044,8 +1044,6 @@ int rt2x00mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | |||
| 1044 | #endif /* CONFIG_RT2X00_LIB_CRYPTO */ | 1044 | #endif /* CONFIG_RT2X00_LIB_CRYPTO */ |
| 1045 | int rt2x00mac_get_stats(struct ieee80211_hw *hw, | 1045 | int rt2x00mac_get_stats(struct ieee80211_hw *hw, |
| 1046 | struct ieee80211_low_level_stats *stats); | 1046 | struct ieee80211_low_level_stats *stats); |
| 1047 | int rt2x00mac_get_tx_stats(struct ieee80211_hw *hw, | ||
| 1048 | struct ieee80211_tx_queue_stats *stats); | ||
| 1049 | void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, | 1047 | void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, |
| 1050 | struct ieee80211_vif *vif, | 1048 | struct ieee80211_vif *vif, |
| 1051 | struct ieee80211_bss_conf *bss_conf, | 1049 | struct ieee80211_bss_conf *bss_conf, |