diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2009-06-04 12:00:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-07 08:20:20 -0400 |
commit | fe49f04aa8c0f74c363cbb1e9852a0d7769b5a99 (patch) | |
tree | 0017d7c78c5ebf7aafa6b9a1462dd768df06662c /drivers/net/ixgbe/ixgbe_ethtool.c | |
parent | 21fa4e66bd0bedfa4ed6aa6f7008b2aff6d45c8d (diff) |
ixgbe: move v_idx into q_vector and use as index only
The v_idx value was being used as both a bitmask and an index. This change
makes it so that the q_vector contains the index and allows for much of the
code to be simplified since disabling a q_vector involves only clearing one
bit in the interrupt bitmask.
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.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c index e0feaf5725bb..003b6e51cf93 100644 --- a/drivers/net/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ixgbe/ixgbe_ethtool.c | |||
@@ -840,7 +840,6 @@ static int ixgbe_set_ringparam(struct net_device *netdev, | |||
840 | } | 840 | } |
841 | goto err_setup; | 841 | goto err_setup; |
842 | } | 842 | } |
843 | temp_tx_ring[i].v_idx = adapter->tx_ring[i].v_idx; | ||
844 | } | 843 | } |
845 | need_update = true; | 844 | need_update = true; |
846 | } | 845 | } |
@@ -870,7 +869,6 @@ static int ixgbe_set_ringparam(struct net_device *netdev, | |||
870 | } | 869 | } |
871 | goto err_setup; | 870 | goto err_setup; |
872 | } | 871 | } |
873 | temp_rx_ring[i].v_idx = adapter->rx_ring[i].v_idx; | ||
874 | } | 872 | } |
875 | need_update = true; | 873 | need_update = true; |
876 | } | 874 | } |
@@ -1987,8 +1985,7 @@ static int ixgbe_set_coalesce(struct net_device *netdev, | |||
1987 | else | 1985 | else |
1988 | /* rx only or mixed */ | 1986 | /* rx only or mixed */ |
1989 | q_vector->eitr = adapter->eitr_param; | 1987 | q_vector->eitr = adapter->eitr_param; |
1990 | ixgbe_write_eitr(adapter, i, | 1988 | ixgbe_write_eitr(q_vector); |
1991 | EITR_INTS_PER_SEC_TO_REG(q_vector->eitr)); | ||
1992 | } | 1989 | } |
1993 | 1990 | ||
1994 | return 0; | 1991 | return 0; |