aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000e/netdev.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
-rw-r--r--drivers/net/e1000e/netdev.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index 16a03c553299..d1f60c570c0e 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -3134,6 +3134,7 @@ void e1000e_reset(struct e1000_adapter *adapter)
3134 fc->high_water = 0x5000; 3134 fc->high_water = 0x5000;
3135 fc->low_water = 0x3000; 3135 fc->low_water = 0x3000;
3136 } 3136 }
3137 fc->refresh_time = 0x1000;
3137 } else { 3138 } else {
3138 if ((adapter->flags & FLAG_HAS_ERT) && 3139 if ((adapter->flags & FLAG_HAS_ERT) &&
3139 (adapter->netdev->mtu > ETH_DATA_LEN)) 3140 (adapter->netdev->mtu > ETH_DATA_LEN))
@@ -3171,10 +3172,6 @@ void e1000e_reset(struct e1000_adapter *adapter)
3171 if (mac->ops.init_hw(hw)) 3172 if (mac->ops.init_hw(hw))
3172 e_err("Hardware Error\n"); 3173 e_err("Hardware Error\n");
3173 3174
3174 /* additional part of the flow-control workaround above */
3175 if (hw->mac.type == e1000_pchlan)
3176 ew32(FCRTV_PCH, 0x1000);
3177
3178 e1000_update_mng_vlan(adapter); 3175 e1000_update_mng_vlan(adapter);
3179 3176
3180 /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */ 3177 /* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */