diff options
author | Stefan Assmann <sassmann@kpanic.de> | 2015-06-03 13:25:54 +0200 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2015-06-09 14:56:32 -0700 |
commit | d1a886894678142aab542e9ac0a35c2ce65de6cd (patch) | |
tree | 90cbb378f07eb292c92e27da717e8778948bf6af /patches | |
parent | 571fe439b799d961206397b801d59364f7842c71 (diff) |
backports: replace igb ethtool_cmd_mdix patch with semantic patch
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/ethtool_cmd_mdix.cocci | 14 | ||||
-rw-r--r-- | patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/igb_ethtool_cmd_mdix.patch | 47 |
2 files changed, 14 insertions, 47 deletions
diff --git a/patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/ethtool_cmd_mdix.cocci b/patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/ethtool_cmd_mdix.cocci new file mode 100644 index 00000000..b32973bf --- /dev/null +++ b/patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/ethtool_cmd_mdix.cocci @@ -0,0 +1,14 @@ +@r1@ +expression E1; +struct ethtool_cmd *ecmd; +@@ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) + ecmd->eth_tp_mdix_ctrl = E1; ++#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) */ + +@r2@ +struct ethtool_cmd *ecmd; +@@ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) + if (ecmd->eth_tp_mdix_ctrl) {...} ++#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) */ 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 deleted file mode 100644 index f48aa3f5..00000000 --- a/patches/collateral-evolutions/network/0040-ethtool_cmd_mdix/igb_ethtool_cmd_mdix.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/drivers/net/ethernet/intel/igb/igb_ethtool.c -+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c -@@ -247,10 +247,12 @@ static int igb_get_settings(struct net_d - else - ecmd->eth_tp_mdix = ETH_TP_MDI_INVALID; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) - if (hw->phy.mdix == AUTO_ALL_MODES) - ecmd->eth_tp_mdix_ctrl = ETH_TP_MDI_AUTO; - else - ecmd->eth_tp_mdix_ctrl = hw->phy.mdix; -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) */ - - return 0; - } -@@ -269,6 +271,7 @@ static int igb_set_settings(struct net_d - return -EINVAL; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) - /* MDI setting is only allowed when autoneg enabled because - * some hardware doesn't allow MDI setting when speed or - * duplex is forced. -@@ -283,6 +286,7 @@ static int igb_set_settings(struct net_d - return -EINVAL; - } - } -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) */ - - while (test_and_set_bit(__IGB_RESETTING, &adapter->state)) - usleep_range(1000, 2000); -@@ -326,6 +330,7 @@ static int igb_set_settings(struct net_d - } - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) - /* 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 -@@ -336,6 +341,7 @@ static int igb_set_settings(struct net_d - else - hw->phy.mdix = ecmd->eth_tp_mdix_ctrl; - } -+#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,7,0) */ - - /* reset the link */ - if (netif_running(adapter->netdev)) { |