igb: fix two minor items found during code review
This patch addresses two minor items I found while cleaning up the igb driver for our sourceforge version. The first clears the context index if we don't flag that we need it. The second item is that eims_other should be used instead of bit defines when setting all of the EICS bits prior to reset. 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>
This commit is contained in:
parent
04fe63583d
commit
265de40908
|
@ -2771,6 +2771,8 @@ static inline bool igb_tx_csum_adv(struct igb_adapter *adapter,
|
|||
if (adapter->flags & IGB_FLAG_NEED_CTX_IDX)
|
||||
context_desc->mss_l4len_idx =
|
||||
cpu_to_le32(tx_ring->queue_index << 4);
|
||||
else
|
||||
context_desc->mss_l4len_idx = 0;
|
||||
|
||||
buffer_info->time_stamp = jiffies;
|
||||
buffer_info->next_to_watch = i;
|
||||
|
@ -3040,8 +3042,8 @@ static void igb_tx_timeout(struct net_device *netdev)
|
|||
/* Do the reset outside of interrupt context */
|
||||
adapter->tx_timeout_count++;
|
||||
schedule_work(&adapter->reset_task);
|
||||
wr32(E1000_EICS, adapter->eims_enable_mask &
|
||||
~(E1000_EIMS_TCP_TIMER | E1000_EIMS_OTHER));
|
||||
wr32(E1000_EICS,
|
||||
(adapter->eims_enable_mask & ~adapter->eims_other));
|
||||
}
|
||||
|
||||
static void igb_reset_task(struct work_struct *work)
|
||||
|
|
Loading…
Reference in New Issue