aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.4
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2017-02-20 14:45:59 +0100
committerJo-Philipp Wich <jo@mein.io>2017-02-20 16:02:54 +0100
commit06f3b919021f3cf55cc4e1aa22650089dc2ab903 (patch)
tree3f9bbae511dec7decb3a129b73e72d1dd5ee70dc /target/linux/layerscape/patches-4.4
parent56121140907626fbbdb18a8cd7e99677763a3d6e (diff)
downloadupstream-06f3b919021f3cf55cc4e1aa22650089dc2ab903.tar.gz
upstream-06f3b919021f3cf55cc4e1aa22650089dc2ab903.tar.bz2
upstream-06f3b919021f3cf55cc4e1aa22650089dc2ab903.zip
kernel: update kernel 4.4 to version 4.4.50
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
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.patch11
1 files changed, 3 insertions, 8 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
index d30be32e67..f5a2ed73cc 100644
--- 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
@@ -10,11 +10,9 @@ 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)
+@@ -409,6 +409,10 @@ void get_pause_cfg(struct mac_device *ma
}
EXPORT_SYMBOL(get_pause_cfg);
@@ -25,7 +23,7 @@ index aaedaae..c092afb 100644
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,
+@@ -473,7 +477,7 @@ static int xgmac_init_phy(struct net_dev
mac_dev->phy_if);
else
phy_dev = of_phy_connect(net_dev, mac_dev->phy_node,
@@ -34,7 +32,7 @@ index aaedaae..c092afb 100644
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,
+@@ -506,7 +510,7 @@ static int memac_init_phy(struct net_dev
return 0;
} else
phy_dev = of_phy_connect(net_dev, mac_dev->phy_node,
@@ -43,6 +41,3 @@ index aaedaae..c092afb 100644
mac_dev->phy_if);
} else {
if (!mac_dev->phy_node)
---
-2.1.0.27.g96db324
-