diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-07-08 17:03:36 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-08 17:03:36 +0200 |
| commit | 204d1641d200709c759d8c269458cbc7de378c40 (patch) | |
| tree | ce88690b4422078883f1651537ccd1f5d8ed7258 /drivers/net/wireless/rt2x00/rt61pci.c | |
| parent | packet: Fix build with INET disabled. (diff) | |
| parent | rt2x00: Implement tx_frames_pending mac80211 callback function. (diff) | |
| download | linux-204d1641d200709c759d8c269458cbc7de378c40.tar.xz linux-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/rt61pci.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 9d35ec16a3a5..53110b83bf6e 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c @@ -2982,6 +2982,7 @@ static const struct ieee80211_ops rt61pci_mac80211_ops = { .set_antenna = rt2x00mac_set_antenna, .get_antenna = rt2x00mac_get_antenna, .get_ringparam = rt2x00mac_get_ringparam, + .tx_frames_pending = rt2x00mac_tx_frames_pending, }; static const struct rt2x00lib_ops rt61pci_rt2x00_ops = { |