diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-06-12 15:38:19 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-06-13 17:58:07 +0200 |
| commit | 172eebbd283d0b4b0ef25f65cc0f39ee162a24b7 (patch) | |
| tree | 9df59a9d6659f530f2a97e4f49278ecf808d8bf7 /target/linux/lantiq/patches-4.4 | |
| parent | 233ec5121734947afa4d6a50712ae7a7ba47eb5d (diff) | |
| download | mtk-20170518-172eebbd283d0b4b0ef25f65cc0f39ee162a24b7.zip mtk-20170518-172eebbd283d0b4b0ef25f65cc0f39ee162a24b7.tar.gz mtk-20170518-172eebbd283d0b4b0ef25f65cc0f39ee162a24b7.tar.bz2 | |
lantiq: fold 0400-xrx200-net-multi-phy.patch into 0025-NET-MIPS-lantiq-adds-xrx200-net.patch
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/lantiq/patches-4.4')
| -rw-r--r-- | target/linux/lantiq/patches-4.4/0025-NET-MIPS-lantiq-adds-xrx200-net.patch | 10 | ||||
| -rw-r--r-- | target/linux/lantiq/patches-4.4/0400-xrx200-net-multi-phy.patch | 38 |
2 files changed, 9 insertions, 39 deletions
diff --git a/target/linux/lantiq/patches-4.4/0025-NET-MIPS-lantiq-adds-xrx200-net.patch b/target/linux/lantiq/patches-4.4/0025-NET-MIPS-lantiq-adds-xrx200-net.patch index 1f735f9..7d81720 100644 --- a/target/linux/lantiq/patches-4.4/0025-NET-MIPS-lantiq-adds-xrx200-net.patch +++ b/target/linux/lantiq/patches-4.4/0025-NET-MIPS-lantiq-adds-xrx200-net.patch @@ -209,7 +209,7 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net +}; --- /dev/null +++ b/drivers/net/ethernet/lantiq_xrx200.c -@@ -0,0 +1,1802 @@ +@@ -0,0 +1,1810 @@ +/* + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published @@ -1421,13 +1421,18 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net +static void xrx200_mdio_link(struct net_device *dev) +{ + struct xrx200_priv *priv = netdev_priv(dev); ++ bool changed = false, link = false; + int i; + + for (i = 0; i < priv->num_port; i++) { + if (!priv->port[i].phydev) + continue; + ++ if (priv->port[i].phydev->link) ++ link = true; ++ + if (priv->port[i].link != priv->port[i].phydev->link) { ++ changed = true; + xrx200_gmac_update(&priv->port[i]); + priv->port[i].link = priv->port[i].phydev->link; + netdev_info(dev, "port %d %s link\n", @@ -1435,6 +1440,8 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net + (priv->port[i].link)?("got"):("lost")); + } + } ++ if (changed && !link) ++ netif_carrier_off(dev); +} + +static inline int xrx200_mdio_poll(struct mii_bus *bus) @@ -1512,6 +1519,7 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net + | SUPPORTED_TP); + phydev->advertising = phydev->supported; + port->phydev = phydev; ++ phydev->no_auto_carrier_off = true; + + pr_info("%s: attached PHY [%s] (phy_addr=%s, irq=%d)\n", + dev->name, phydev->drv->name, diff --git a/target/linux/lantiq/patches-4.4/0400-xrx200-net-multi-phy.patch b/target/linux/lantiq/patches-4.4/0400-xrx200-net-multi-phy.patch deleted file mode 100644 index a86fe8d..0000000 --- a/target/linux/lantiq/patches-4.4/0400-xrx200-net-multi-phy.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/drivers/net/ethernet/lantiq_xrx200.c -+++ b/drivers/net/ethernet/lantiq_xrx200.c -@@ -1209,13 +1209,18 @@ static void xrx200_gmac_update(struct xr - static void xrx200_mdio_link(struct net_device *dev) - { - struct xrx200_priv *priv = netdev_priv(dev); -+ bool changed = false, link = false; - int i; - - for (i = 0; i < priv->num_port; i++) { - if (!priv->port[i].phydev) - continue; - -+ if (priv->port[i].phydev->link) -+ link = true; -+ - if (priv->port[i].link != priv->port[i].phydev->link) { -+ changed = true; - xrx200_gmac_update(&priv->port[i]); - priv->port[i].link = priv->port[i].phydev->link; - netdev_info(dev, "port %d %s link\n", -@@ -1223,6 +1228,8 @@ static void xrx200_mdio_link(struct net_ - (priv->port[i].link)?("got"):("lost")); - } - } -+ if (changed && !link) -+ netif_carrier_off(dev); - } - - static inline int xrx200_mdio_poll(struct mii_bus *bus) -@@ -1300,6 +1307,7 @@ static int xrx200_mdio_probe(struct net_ - | SUPPORTED_TP); - phydev->advertising = phydev->supported; - port->phydev = phydev; -+ phydev->no_auto_carrier_off = true; - - pr_info("%s: attached PHY [%s] (phy_addr=%s, irq=%d)\n", - dev->name, phydev->drv->name, |