aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ixgbe/ixgbe_ethtool.c
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2010-08-19 09:40:31 -0400
committerDavid S. Miller <davem@davemloft.net>2010-08-19 19:44:27 -0400
commit31f05a2d875327ef133ac4b62261c4b875d1d10c (patch)
tree9a43b360c95d8648466c2f38a496175bae384b55 /drivers/net/ixgbe/ixgbe_ethtool.c
parent9e10e045f8223e09f2c70cd6849ff86803d50c88 (diff)
ixgbe: update all DESC_ADV macros to accept a ring pointer
All of the DESC_ADV macros are currently needing the pointers to be de-referenced before accessing the ring. Instead of having to add all of the asterisks it is easier to just update the macro to expect a pointer to the ring. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ixgbe/ixgbe_ethtool.c')
-rw-r--r--drivers/net/ixgbe/ixgbe_ethtool.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index fb6d8e88eb05..4d74f4bc7a01 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -1560,7 +1560,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
1560 IXGBE_WRITE_REG(&adapter->hw, IXGBE_TXDCTL(0), reg_data); 1560 IXGBE_WRITE_REG(&adapter->hw, IXGBE_TXDCTL(0), reg_data);
1561 1561
1562 for (i = 0; i < tx_ring->count; i++) { 1562 for (i = 0; i < tx_ring->count; i++) {
1563 union ixgbe_adv_tx_desc *desc = IXGBE_TX_DESC_ADV(*tx_ring, i); 1563 union ixgbe_adv_tx_desc *desc = IXGBE_TX_DESC_ADV(tx_ring, i);
1564 struct sk_buff *skb; 1564 struct sk_buff *skb;
1565 unsigned int size = 1024; 1565 unsigned int size = 1024;
1566 1566
@@ -1661,7 +1661,7 @@ static int ixgbe_setup_desc_rings(struct ixgbe_adapter *adapter)
1661 1661
1662 for (i = 0; i < rx_ring->count; i++) { 1662 for (i = 0; i < rx_ring->count; i++) {
1663 union ixgbe_adv_rx_desc *rx_desc = 1663 union ixgbe_adv_rx_desc *rx_desc =
1664 IXGBE_RX_DESC_ADV(*rx_ring, i); 1664 IXGBE_RX_DESC_ADV(rx_ring, i);
1665 struct sk_buff *skb; 1665 struct sk_buff *skb;
1666 1666
1667 skb = alloc_skb(IXGBE_RXBUFFER_2048 + NET_IP_ALIGN, GFP_KERNEL); 1667 skb = alloc_skb(IXGBE_RXBUFFER_2048 + NET_IP_ALIGN, GFP_KERNEL);