aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.4
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2017-02-11 02:03:35 +0800
committerJohn Crispin <john@phrozen.org>2017-02-13 10:24:32 +0100
commit3c01fd011993a6c80ac4bcd1e655803a2b3a1200 (patch)
tree2de1aca905a978a25f83fc8e9fce170677fd10c9 /target/linux/layerscape/patches-4.4
parent634328c0de7d12e567af7f2ebaf0b01c4f4bf156 (diff)
downloadupstream-3c01fd011993a6c80ac4bcd1e655803a2b3a1200.tar.gz
upstream-3c01fd011993a6c80ac4bcd1e655803a2b3a1200.tar.bz2
upstream-3c01fd011993a6c80ac4bcd1e655803a2b3a1200.zip
layerscape: fix adjust_link for 10G & 2.5G
Added a linux-4.4 patch to fix adjust_link for 10G & 2.5G. Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-4.4')
-rw-r--r--target/linux/layerscape/patches-4.4/7226-dpaa_eth-fix-adjust_link-for-10G-2.5G.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-4.4/7226-dpaa_eth-fix-adjust_link-for-10G-2.5G.patch b/target/linux/layerscape/patches-4.4/7226-dpaa_eth-fix-adjust_link-for-10G-2.5G.patch
new file mode 100644
index 0000000000..d30be32e67
--- /dev/null
+++ b/target/linux/layerscape/patches-4.4/7226-dpaa_eth-fix-adjust_link-for-10G-2.5G.patch
@@ -0,0 +1,48 @@
+From 09a3bd3bb7e59703bfa5fa580436b4a85b15cfb0 Mon Sep 17 00:00:00 2001
+From: Shaohui Xie <Shaohui.Xie@nxp.com>
+Date: Fri, 22 Apr 2016 11:26:14 +0800
+Subject: [PATCH] dpaa_eth: fix adjust_link for 10G & 2.5G
+
+We don't support adjust link for 10G & 2.5G.
+
+Signed-off-by: Shaohui Xie <Shaohui.Xie@nxp.com>
+---
+ drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c b/drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c
+index aaedaae..c092afb 100644
+--- a/drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c
++++ b/drivers/net/ethernet/freescale/sdk_dpaa/mac-api.c
+@@ -409,6 +409,10 @@ void get_pause_cfg(struct mac_device *mac_dev, bool *rx_pause, bool *tx_pause)
+ }
+ EXPORT_SYMBOL(get_pause_cfg);
+
++static void adjust_link_void(struct net_device *net_dev)
++{
++}
++
+ static void adjust_link(struct net_device *net_dev)
+ {
+ struct dpa_priv_s *priv = netdev_priv(net_dev);
+@@ -473,7 +477,7 @@ static int xgmac_init_phy(struct net_device *net_dev,
+ mac_dev->phy_if);
+ else
+ phy_dev = of_phy_connect(net_dev, mac_dev->phy_node,
+- &adjust_link, 0, mac_dev->phy_if);
++ &adjust_link_void, 0, mac_dev->phy_if);
+ if (unlikely(phy_dev == NULL) || IS_ERR(phy_dev)) {
+ netdev_err(net_dev, "Could not attach to PHY %s\n",
+ mac_dev->phy_node ?
+@@ -506,7 +510,7 @@ static int memac_init_phy(struct net_device *net_dev,
+ return 0;
+ } else
+ phy_dev = of_phy_connect(net_dev, mac_dev->phy_node,
+- &adjust_link, 0,
++ &adjust_link_void, 0,
+ mac_dev->phy_if);
+ } else {
+ if (!mac_dev->phy_node)
+--
+2.1.0.27.g96db324
+