diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-05-21 19:32:46 +0000 |
commit | 9157f620436a8383b13c30c0a26ad06b976b1a0b (patch) | |
tree | 768c585c31df15ffc89cd03480ce4558ea291ca0 /target/linux/ixp4xx/patches-3.18/207-npe_driver_multiphy_support.patch | |
parent | 19deb0cf132ecd6cd1b4aa79fcc4462c698a38dd (diff) | |
download | master-187ad058-9157f620436a8383b13c30c0a26ad06b976b1a0b.tar.gz master-187ad058-9157f620436a8383b13c30c0a26ad06b976b1a0b.tar.bz2 master-187ad058-9157f620436a8383b13c30c0a26ad06b976b1a0b.zip |
kernel: update 3.18 to 3.18.14
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14
Build tested on brcm63xx and ipq806x, runtested on brcm63xx.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45711 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-3.18/207-npe_driver_multiphy_support.patch')
-rw-r--r-- | target/linux/ixp4xx/patches-3.18/207-npe_driver_multiphy_support.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ixp4xx/patches-3.18/207-npe_driver_multiphy_support.patch b/target/linux/ixp4xx/patches-3.18/207-npe_driver_multiphy_support.patch index c1dda695ce..32035ab56a 100644 --- a/target/linux/ixp4xx/patches-3.18/207-npe_driver_multiphy_support.patch +++ b/target/linux/ixp4xx/patches-3.18/207-npe_driver_multiphy_support.patch @@ -37,7 +37,7 @@ TODO: take care of additional PHYs through the PHY abstraction layer /* Information about built-in HSS (synchronous serial) interfaces */ --- a/drivers/net/ethernet/xscale/ixp4xx_eth.c +++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c -@@ -614,6 +614,37 @@ static int ixp4xx_phy_connect(struct net +@@ -610,6 +610,37 @@ static int ixp4xx_phy_connect(struct net struct eth_plat_info *plat = port->plat; char phy_id[MII_BUS_ID_SIZE + 3]; @@ -75,7 +75,7 @@ TODO: take care of additional PHYs through the PHY abstraction layer snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, mdio_bus->id, plat->phy); port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, -@@ -636,21 +667,32 @@ static void ixp4xx_phy_disconnect(struct +@@ -632,21 +663,32 @@ static void ixp4xx_phy_disconnect(struct { struct port *port = netdev_priv(dev); @@ -111,7 +111,7 @@ TODO: take care of additional PHYs through the PHY abstraction layer } static inline void debug_pkt(struct net_device *dev, const char *func, -@@ -1052,6 +1094,9 @@ static int eth_ioctl(struct net_device * +@@ -1048,6 +1090,9 @@ static int eth_ioctl(struct net_device * return hwtstamp_get(dev, req); } @@ -121,7 +121,7 @@ TODO: take care of additional PHYs through the PHY abstraction layer return phy_mii_ioctl(port->phydev, req, cmd); } -@@ -1072,18 +1117,30 @@ static void ixp4xx_get_drvinfo(struct ne +@@ -1068,18 +1113,30 @@ static void ixp4xx_get_drvinfo(struct ne static int ixp4xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) { struct port *port = netdev_priv(dev); |