summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/intel/e1000
diff options
context:
space:
mode:
authorHong Zhiguo <zhiguohong@tencent.com>2013-10-22 18:32:56 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-11-01 05:45:29 -0700
commit49a45a0686cc2b43bcb3834a68416a201475dc77 (patch)
tree29c91baa900bfc736f0a19b878bcaaa199752b85 /drivers/net/ethernet/intel/e1000
parentba4865027c11d7ac8e5a33e0624dd415caab2027 (diff)
downloadblackbird-op-linux-49a45a0686cc2b43bcb3834a68416a201475dc77.tar.gz
blackbird-op-linux-49a45a0686cc2b43bcb3834a68416a201475dc77.zip
e1000: fix wrong queue idx calculation
tx_ring and adapter->tx_ring are already of type "struct e1000_tx_ring *" Signed-off-by: Hong Zhiguo <zhiguohong@tencent.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000')
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c
index 59ad007dd5aa..ad6800ad1bfc 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_main.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c
@@ -3917,8 +3917,7 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter,
" next_to_watch <%x>\n"
" jiffies <%lx>\n"
" next_to_watch.status <%x>\n",
- (unsigned long)((tx_ring - adapter->tx_ring) /
- sizeof(struct e1000_tx_ring)),
+ (unsigned long)(tx_ring - adapter->tx_ring),
readl(hw->hw_addr + tx_ring->tdh),
readl(hw->hw_addr + tx_ring->tdt),
tx_ring->next_to_use,
OpenPOWER on IntegriCloud