diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /drivers/net/ethernet/intel/e1000e/netdev.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/netdev.c')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index e87e9b01f404..4ef786775acb 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c | |||
| @@ -4868,7 +4868,7 @@ static void e1000_watchdog_task(struct work_struct *work) | |||
| 4868 | */ | 4868 | */ |
| 4869 | if ((hw->phy.type == e1000_phy_igp_3 || | 4869 | if ((hw->phy.type == e1000_phy_igp_3 || |
| 4870 | hw->phy.type == e1000_phy_bm) && | 4870 | hw->phy.type == e1000_phy_bm) && |
| 4871 | (hw->mac.autoneg == true) && | 4871 | hw->mac.autoneg && |
| 4872 | (adapter->link_speed == SPEED_10 || | 4872 | (adapter->link_speed == SPEED_10 || |
| 4873 | adapter->link_speed == SPEED_100) && | 4873 | adapter->link_speed == SPEED_100) && |
| 4874 | (adapter->link_duplex == HALF_DUPLEX)) { | 4874 | (adapter->link_duplex == HALF_DUPLEX)) { |