aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2800lib.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/rt2800lib.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/rt2800lib.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2800lib.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 02ffcf54bf09..eb1e1d00bec3 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -2030,12 +2030,6 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
2030 IEEE80211_HW_SUPPORTS_PS | 2030 IEEE80211_HW_SUPPORTS_PS |
2031 IEEE80211_HW_PS_NULLFUNC_STACK; 2031 IEEE80211_HW_PS_NULLFUNC_STACK;
2032 2032
2033 if (rt2x00_intf_is_usb(rt2x00dev))
2034 rt2x00dev->hw->extra_tx_headroom =
2035 TXINFO_DESC_SIZE + TXWI_DESC_SIZE;
2036 else if (rt2x00_intf_is_pci(rt2x00dev))
2037 rt2x00dev->hw->extra_tx_headroom = TXWI_DESC_SIZE;
2038
2039 SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev); 2033 SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);
2040 SET_IEEE80211_PERM_ADDR(rt2x00dev->hw, 2034 SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
2041 rt2x00_eeprom_addr(rt2x00dev, 2035 rt2x00_eeprom_addr(rt2x00dev,