diff options
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 941c5f9d0dd9..c3105c5087e0 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -679,8 +679,8 @@ static bool e1000_clean_tx_irq(struct e1000_adapter *adapter) | |||
679 | adapter->detect_tx_hung = 0; | 679 | adapter->detect_tx_hung = 0; |
680 | if (tx_ring->buffer_info[i].time_stamp && | 680 | if (tx_ring->buffer_info[i].time_stamp && |
681 | time_after(jiffies, tx_ring->buffer_info[i].time_stamp | 681 | time_after(jiffies, tx_ring->buffer_info[i].time_stamp |
682 | + (adapter->tx_timeout_factor * HZ)) | 682 | + (adapter->tx_timeout_factor * HZ)) && |
683 | && !(er32(STATUS) & E1000_STATUS_TXOFF)) { | 683 | !(er32(STATUS) & E1000_STATUS_TXOFF)) { |
684 | schedule_work(&adapter->print_hang_task); | 684 | schedule_work(&adapter->print_hang_task); |
685 | netif_stop_queue(netdev); | 685 | netif_stop_queue(netdev); |
686 | } | 686 | } |
@@ -4046,8 +4046,8 @@ static int e1000_transfer_dhcp_info(struct e1000_adapter *adapter, | |||
4046 | u16 length, offset; | 4046 | u16 length, offset; |
4047 | 4047 | ||
4048 | if (vlan_tx_tag_present(skb)) { | 4048 | if (vlan_tx_tag_present(skb)) { |
4049 | if (!((vlan_tx_tag_get(skb) == adapter->hw.mng_cookie.vlan_id) | 4049 | if (!((vlan_tx_tag_get(skb) == adapter->hw.mng_cookie.vlan_id) && |
4050 | && (adapter->hw.mng_cookie.status & | 4050 | (adapter->hw.mng_cookie.status & |
4051 | E1000_MNG_DHCP_COOKIE_STATUS_VLAN))) | 4051 | E1000_MNG_DHCP_COOKIE_STATUS_VLAN))) |
4052 | return 0; | 4052 | return 0; |
4053 | } | 4053 | } |