diff options
Diffstat (limited to 'patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/igb_ethtool_cmd_mdix.patch')
-rw-r--r-- | patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/igb_ethtool_cmd_mdix.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/igb_ethtool_cmd_mdix.patch b/patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/igb_ethtool_cmd_mdix.patch index d21f7f90..f48aa3f5 100644 --- a/patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/igb_ethtool_cmd_mdix.patch +++ b/patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/igb_ethtool_cmd_mdix.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c -@@ -245,10 +245,12 @@ static int igb_get_settings(struct net_d +@@ -247,10 +247,12 @@ static int igb_get_settings(struct net_d else ecmd->eth_tp_mdix = ETH_TP_MDI_INVALID; @@ -13,7 +13,7 @@ return 0; } -@@ -267,6 +269,7 @@ static int igb_set_settings(struct net_d +@@ -269,6 +271,7 @@ static int igb_set_settings(struct net_d return -EINVAL; } @@ -21,7 +21,7 @@ /* MDI setting is only allowed when autoneg enabled because * some hardware doesn't allow MDI setting when speed or * duplex is forced. -@@ -281,6 +284,7 @@ static int igb_set_settings(struct net_d +@@ -283,6 +286,7 @@ static int igb_set_settings(struct net_d return -EINVAL; } } @@ -29,7 +29,7 @@ while (test_and_set_bit(__IGB_RESETTING, &adapter->state)) usleep_range(1000, 2000); -@@ -324,6 +328,7 @@ static int igb_set_settings(struct net_d +@@ -326,6 +330,7 @@ static int igb_set_settings(struct net_d } } @@ -37,7 +37,7 @@ /* MDI-X => 2; MDI => 1; Auto => 3 */ if (ecmd->eth_tp_mdix_ctrl) { /* fix up the value for auto (3 => 0) as zero is mapped -@@ -334,6 +339,7 @@ static int igb_set_settings(struct net_d +@@ -336,6 +341,7 @@ static int igb_set_settings(struct net_d else hw->phy.mdix = ecmd->eth_tp_mdix_ctrl; } |