aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2500usb.c
diff options
context:
space:
mode:
authorGertjan van Wingerde <gwingerde@gmail.com>2009-11-23 16:44:52 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-11-28 15:04:38 -0500
commite6218cc47bd54710dc523e8c983ceddba625e3ae (patch)
tree5ea8f107baab70b268eb0cc8d71b15a57838eb89 /drivers/net/wireless/rt2x00/rt2500usb.c
parent04d0362e2fa9d5f1ab560d0d59d04a535b4f3973 (diff)
rt2x00: Centralize setting of extra TX headroom requested by rt2x00.
Set the value of extra_tx_headroom in a central place, rather than in each of the drivers. This is preparatory for taking alignment space into account in the TX headroom requested by rt2x00. Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com> Acked-by: Ivo van Doorn <IvDoorn@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2500usb.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2500usb.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index 02290f68113e..83f2592c59de 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1656,8 +1656,6 @@ static int rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
1656 IEEE80211_HW_SUPPORTS_PS | 1656 IEEE80211_HW_SUPPORTS_PS |
1657 IEEE80211_HW_PS_NULLFUNC_STACK; 1657 IEEE80211_HW_PS_NULLFUNC_STACK;
1658 1658
1659 rt2x00dev->hw->extra_tx_headroom = TXD_DESC_SIZE;
1660
1661 SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev); 1659 SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);
1662 SET_IEEE80211_PERM_ADDR(rt2x00dev->hw, 1660 SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
1663 rt2x00_eeprom_addr(rt2x00dev, 1661 rt2x00_eeprom_addr(rt2x00dev,
@@ -1829,6 +1827,7 @@ static const struct rt2x00_ops rt2500usb_ops = {
1829 .eeprom_size = EEPROM_SIZE, 1827 .eeprom_size = EEPROM_SIZE,
1830 .rf_size = RF_SIZE, 1828 .rf_size = RF_SIZE,
1831 .tx_queues = NUM_TX_QUEUES, 1829 .tx_queues = NUM_TX_QUEUES,
1830 .extra_tx_headroom = TXD_DESC_SIZE,
1832 .rx = &rt2500usb_queue_rx, 1831 .rx = &rt2500usb_queue_rx,
1833 .tx = &rt2500usb_queue_tx, 1832 .tx = &rt2500usb_queue_tx,
1834 .bcn = &rt2500usb_queue_bcn, 1833 .bcn = &rt2500usb_queue_bcn,