diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2011-07-08 11:03:36 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-08 11:03:36 -0400 |
| commit | 204d1641d200709c759d8c269458cbc7de378c40 (patch) | |
| tree | ce88690b4422078883f1651537ccd1f5d8ed7258 /drivers/net/wireless/rt2x00/rt2x00.h | |
| parent | packet: Fix build with INET disabled. (diff) | |
| parent | rt2x00: Implement tx_frames_pending mac80211 callback function. (diff) | |
| download | linux-dev-204d1641d200709c759d8c269458cbc7de378c40.tar.xz linux-dev-204d1641d200709c759d8c269458cbc7de378c40.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00.h')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index 4efaf886fb89..f82bfeb79ebb 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h @@ -1277,6 +1277,7 @@ int rt2x00mac_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant); int rt2x00mac_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant); void rt2x00mac_get_ringparam(struct ieee80211_hw *hw, u32 *tx, u32 *tx_max, u32 *rx, u32 *rx_max); +bool rt2x00mac_tx_frames_pending(struct ieee80211_hw *hw); /* * Driver allocation handlers. |