diff options
author | Gertjan van Wingerde <gwingerde@gmail.com> | 2009-11-23 16:44:52 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-28 15:04:38 -0500 |
commit | e6218cc47bd54710dc523e8c983ceddba625e3ae (patch) | |
tree | 5ea8f107baab70b268eb0cc8d71b15a57838eb89 /drivers/net/wireless/rt2x00/rt61pci.c | |
parent | 04d0362e2fa9d5f1ab560d0d59d04a535b4f3973 (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/rt61pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt61pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 4cb9afeed9d7..687e17dc2e9f 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
@@ -2546,7 +2546,6 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) | |||
2546 | IEEE80211_HW_SIGNAL_DBM | | 2546 | IEEE80211_HW_SIGNAL_DBM | |
2547 | IEEE80211_HW_SUPPORTS_PS | | 2547 | IEEE80211_HW_SUPPORTS_PS | |
2548 | IEEE80211_HW_PS_NULLFUNC_STACK; | 2548 | IEEE80211_HW_PS_NULLFUNC_STACK; |
2549 | rt2x00dev->hw->extra_tx_headroom = 0; | ||
2550 | 2549 | ||
2551 | SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev); | 2550 | SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev); |
2552 | SET_IEEE80211_PERM_ADDR(rt2x00dev->hw, | 2551 | SET_IEEE80211_PERM_ADDR(rt2x00dev->hw, |
@@ -2794,6 +2793,7 @@ static const struct rt2x00_ops rt61pci_ops = { | |||
2794 | .eeprom_size = EEPROM_SIZE, | 2793 | .eeprom_size = EEPROM_SIZE, |
2795 | .rf_size = RF_SIZE, | 2794 | .rf_size = RF_SIZE, |
2796 | .tx_queues = NUM_TX_QUEUES, | 2795 | .tx_queues = NUM_TX_QUEUES, |
2796 | .extra_tx_headroom = 0, | ||
2797 | .rx = &rt61pci_queue_rx, | 2797 | .rx = &rt61pci_queue_rx, |
2798 | .tx = &rt61pci_queue_tx, | 2798 | .tx = &rt61pci_queue_tx, |
2799 | .bcn = &rt61pci_queue_bcn, | 2799 | .bcn = &rt61pci_queue_bcn, |