hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
owl
Felix Fietkau 2016-06-12 15:38:19 +02:00
parent 233ec51217
commit 172eebbd28
2 changed files with 9 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target/linux/lantiq/patches-4.4/0025-NET-MIPS-lantiq-adds-xrx200-net.patch
View File

@ -209,7 +209,7 @@ Subject: [PATCH 25/36] NET: MIPS: lantiq: adds xrx200-net
+}; +};
--- /dev/null --- /dev/null
+++ b/drivers/net/ethernet/lantiq_xrx200.c +++ 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 + * 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 + * 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) +static void xrx200_mdio_link(struct net_device *dev)
+{ +{
+ struct xrx200_priv *priv = netdev_priv(dev); + struct xrx200_priv *priv = netdev_priv(dev);
+ bool changed = false, link = false;
+ int i; + int i;
+ +
+ for (i = 0; i < priv->num_port; i++) { + for (i = 0; i < priv->num_port; i++) {
+ if (!priv->port[i].phydev) + if (!priv->port[i].phydev)
+ continue; + continue;
+ +
+ if (priv->port[i].phydev->link)
+ link = true;
+
+ if (priv->port[i].link != priv->port[i].phydev->link) { + if (priv->port[i].link != priv->port[i].phydev->link) {
+ changed = true;
+ xrx200_gmac_update(&priv->port[i]); + xrx200_gmac_update(&priv->port[i]);
+ priv->port[i].link = priv->port[i].phydev->link; + priv->port[i].link = priv->port[i].phydev->link;
+ netdev_info(dev, "port %d %s link\n", + 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")); + (priv->port[i].link)?("got"):("lost"));
+ } + }
+ } + }
+ if (changed && !link)
+ netif_carrier_off(dev);
+} +}
+ +
+static inline int xrx200_mdio_poll(struct mii_bus *bus) +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); + | SUPPORTED_TP);
+ phydev->advertising = phydev->supported; + phydev->advertising = phydev->supported;
+ port->phydev = phydev; + port->phydev = phydev;
+ phydev->no_auto_carrier_off = true;
+ +
+ pr_info("%s: attached PHY [%s] (phy_addr=%s, irq=%d)\n", + pr_info("%s: attached PHY [%s] (phy_addr=%s, irq=%d)\n",
+ dev->name, phydev->drv->name, + dev->name, phydev->drv->name,

38
target/linux/lantiq/patches-4.4/0400-xrx200-net-multi-phy.patch
View File

@ -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,