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>
This commit is contained in:
parent
04d0362e2f
commit
e6218cc47b
|
@ -1432,7 +1432,6 @@ static int rt2400pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
|
|||
IEEE80211_HW_SIGNAL_DBM |
|
||||
IEEE80211_HW_SUPPORTS_PS |
|
||||
IEEE80211_HW_PS_NULLFUNC_STACK;
|
||||
rt2x00dev->hw->extra_tx_headroom = 0;
|
||||
|
||||
SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);
|
||||
SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
|
||||
|
@ -1629,6 +1628,7 @@ static const struct rt2x00_ops rt2400pci_ops = {
|
|||
.eeprom_size = EEPROM_SIZE,
|
||||
.rf_size = RF_SIZE,
|
||||
.tx_queues = NUM_TX_QUEUES,
|
||||
.extra_tx_headroom = 0,
|
||||
.rx = &rt2400pci_queue_rx,
|
||||
.tx = &rt2400pci_queue_tx,
|
||||
.bcn = &rt2400pci_queue_bcn,
|
||||
|
|
|
@ -1733,8 +1733,6 @@ static int rt2500pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
|
|||
IEEE80211_HW_SUPPORTS_PS |
|
||||
IEEE80211_HW_PS_NULLFUNC_STACK;
|
||||
|
||||
rt2x00dev->hw->extra_tx_headroom = 0;
|
||||
|
||||
SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);
|
||||
SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
|
||||
rt2x00_eeprom_addr(rt2x00dev,
|
||||
|
@ -1928,6 +1926,7 @@ static const struct rt2x00_ops rt2500pci_ops = {
|
|||
.eeprom_size = EEPROM_SIZE,
|
||||
.rf_size = RF_SIZE,
|
||||
.tx_queues = NUM_TX_QUEUES,
|
||||
.extra_tx_headroom = 0,
|
||||
.rx = &rt2500pci_queue_rx,
|
||||
.tx = &rt2500pci_queue_tx,
|
||||
.bcn = &rt2500pci_queue_bcn,
|
||||
|
|
|
@ -1656,8 +1656,6 @@ static int rt2500usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
|
|||
IEEE80211_HW_SUPPORTS_PS |
|
||||
IEEE80211_HW_PS_NULLFUNC_STACK;
|
||||
|
||||
rt2x00dev->hw->extra_tx_headroom = TXD_DESC_SIZE;
|
||||
|
||||
SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);
|
||||
SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
|
||||
rt2x00_eeprom_addr(rt2x00dev,
|
||||
|
@ -1829,6 +1827,7 @@ static const struct rt2x00_ops rt2500usb_ops = {
|
|||
.eeprom_size = EEPROM_SIZE,
|
||||
.rf_size = RF_SIZE,
|
||||
.tx_queues = NUM_TX_QUEUES,
|
||||
.extra_tx_headroom = TXD_DESC_SIZE,
|
||||
.rx = &rt2500usb_queue_rx,
|
||||
.tx = &rt2500usb_queue_tx,
|
||||
.bcn = &rt2500usb_queue_bcn,
|
||||
|
|
|
@ -2030,12 +2030,6 @@ int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
|
|||
IEEE80211_HW_SUPPORTS_PS |
|
||||
IEEE80211_HW_PS_NULLFUNC_STACK;
|
||||
|
||||
if (rt2x00_intf_is_usb(rt2x00dev))
|
||||
rt2x00dev->hw->extra_tx_headroom =
|
||||
TXINFO_DESC_SIZE + TXWI_DESC_SIZE;
|
||||
else if (rt2x00_intf_is_pci(rt2x00dev))
|
||||
rt2x00dev->hw->extra_tx_headroom = TXWI_DESC_SIZE;
|
||||
|
||||
SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);
|
||||
SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
|
||||
rt2x00_eeprom_addr(rt2x00dev,
|
||||
|
|
|
@ -652,7 +652,7 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
|
|||
{
|
||||
struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
|
||||
__le32 *txd = skbdesc->desc;
|
||||
__le32 *txwi = (__le32 *)(skb->data - rt2x00dev->hw->extra_tx_headroom);
|
||||
__le32 *txwi = (__le32 *)(skb->data - rt2x00dev->ops->extra_tx_headroom);
|
||||
u32 word;
|
||||
|
||||
/*
|
||||
|
@ -725,14 +725,14 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
|
|||
rt2x00_set_field32(&word, TXD_W1_BURST,
|
||||
test_bit(ENTRY_TXD_BURST, &txdesc->flags));
|
||||
rt2x00_set_field32(&word, TXD_W1_SD_LEN0,
|
||||
rt2x00dev->hw->extra_tx_headroom);
|
||||
rt2x00dev->ops->extra_tx_headroom);
|
||||
rt2x00_set_field32(&word, TXD_W1_LAST_SEC0, 0);
|
||||
rt2x00_set_field32(&word, TXD_W1_DMA_DONE, 0);
|
||||
rt2x00_desc_write(txd, 1, word);
|
||||
|
||||
rt2x00_desc_read(txd, 2, &word);
|
||||
rt2x00_set_field32(&word, TXD_W2_SD_PTR1,
|
||||
skbdesc->skb_dma + rt2x00dev->hw->extra_tx_headroom);
|
||||
skbdesc->skb_dma + rt2x00dev->ops->extra_tx_headroom);
|
||||
rt2x00_desc_write(txd, 2, word);
|
||||
|
||||
rt2x00_desc_read(txd, 3, &word);
|
||||
|
@ -1207,6 +1207,7 @@ static const struct rt2x00_ops rt2800pci_ops = {
|
|||
.eeprom_size = EEPROM_SIZE,
|
||||
.rf_size = RF_SIZE,
|
||||
.tx_queues = NUM_TX_QUEUES,
|
||||
.extra_tx_headroom = TXWI_DESC_SIZE,
|
||||
.rx = &rt2800pci_queue_rx,
|
||||
.tx = &rt2800pci_queue_tx,
|
||||
.bcn = &rt2800pci_queue_bcn,
|
||||
|
|
|
@ -796,6 +796,7 @@ static const struct rt2x00_ops rt2800usb_ops = {
|
|||
.eeprom_size = EEPROM_SIZE,
|
||||
.rf_size = RF_SIZE,
|
||||
.tx_queues = NUM_TX_QUEUES,
|
||||
.extra_tx_headroom = TXINFO_DESC_SIZE + TXWI_DESC_SIZE,
|
||||
.rx = &rt2800usb_queue_rx,
|
||||
.tx = &rt2800usb_queue_tx,
|
||||
.bcn = &rt2800usb_queue_bcn,
|
||||
|
|
|
@ -588,6 +588,7 @@ struct rt2x00_ops {
|
|||
const unsigned int eeprom_size;
|
||||
const unsigned int rf_size;
|
||||
const unsigned int tx_queues;
|
||||
const unsigned int extra_tx_headroom;
|
||||
const struct data_queue_desc *rx;
|
||||
const struct data_queue_desc *tx;
|
||||
const struct data_queue_desc *bcn;
|
||||
|
|
|
@ -683,6 +683,11 @@ static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev)
|
|||
*/
|
||||
rt2x00dev->hw->queues = rt2x00dev->ops->tx_queues;
|
||||
|
||||
/*
|
||||
* Initialize extra TX headroom required.
|
||||
*/
|
||||
rt2x00dev->hw->extra_tx_headroom = rt2x00dev->ops->extra_tx_headroom;
|
||||
|
||||
/*
|
||||
* Register HW.
|
||||
*/
|
||||
|
|
|
@ -2546,7 +2546,6 @@ static int rt61pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
|
|||
IEEE80211_HW_SIGNAL_DBM |
|
||||
IEEE80211_HW_SUPPORTS_PS |
|
||||
IEEE80211_HW_PS_NULLFUNC_STACK;
|
||||
rt2x00dev->hw->extra_tx_headroom = 0;
|
||||
|
||||
SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);
|
||||
SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
|
||||
|
@ -2794,6 +2793,7 @@ static const struct rt2x00_ops rt61pci_ops = {
|
|||
.eeprom_size = EEPROM_SIZE,
|
||||
.rf_size = RF_SIZE,
|
||||
.tx_queues = NUM_TX_QUEUES,
|
||||
.extra_tx_headroom = 0,
|
||||
.rx = &rt61pci_queue_rx,
|
||||
.tx = &rt61pci_queue_tx,
|
||||
.bcn = &rt61pci_queue_bcn,
|
||||
|
|
|
@ -2069,7 +2069,6 @@ static int rt73usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
|
|||
IEEE80211_HW_SIGNAL_DBM |
|
||||
IEEE80211_HW_SUPPORTS_PS |
|
||||
IEEE80211_HW_PS_NULLFUNC_STACK;
|
||||
rt2x00dev->hw->extra_tx_headroom = TXD_DESC_SIZE;
|
||||
|
||||
SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);
|
||||
SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
|
||||
|
@ -2312,6 +2311,7 @@ static const struct rt2x00_ops rt73usb_ops = {
|
|||
.eeprom_size = EEPROM_SIZE,
|
||||
.rf_size = RF_SIZE,
|
||||
.tx_queues = NUM_TX_QUEUES,
|
||||
.extra_tx_headroom = TXD_DESC_SIZE,
|
||||
.rx = &rt73usb_queue_rx,
|
||||
.tx = &rt73usb_queue_tx,
|
||||
.bcn = &rt73usb_queue_bcn,
|
||||
|
|
Loading…
Reference in a new issue