Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6218cc4 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

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: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 04d0362e

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/rt2x00/rt2800lib.c

+0 −6
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/rt2x00/rt2800pci.c

+4 −3
Original line number Diff line number Diff line
@@ -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,