diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2020-10-16 22:16:07 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2020-10-18 00:32:15 +0200 |
| commit | edda06c7b41de8e6da3b35baf7ff7011a7e014ff (patch) | |
| tree | 80eb0abd33d07d4037d2d308ed0ec855fd219215 /target/linux/layerscape | |
| parent | 27677af27cba2c3c46cace9675f69bda3c616153 (diff) | |
| download | upstream-edda06c7b41de8e6da3b35baf7ff7011a7e014ff.tar.gz upstream-edda06c7b41de8e6da3b35baf7ff7011a7e014ff.tar.bz2 upstream-edda06c7b41de8e6da3b35baf7ff7011a7e014ff.zip | |
kernel: Update kernel 4.9 to version 4.9.240
Compile and runtime tested on ar71xx/generic.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape')
| -rw-r--r-- | target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch | 2 | ||||
| -rw-r--r-- | target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch index 14e08b291b..82f5e19bf5 100644 --- a/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/202-core-linux-support-layerscape.patch @@ -384,7 +384,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> void __kfree_skb(struct sk_buff *skb); extern struct kmem_cache *skbuff_head_cache; -@@ -3083,6 +3084,7 @@ static inline void skb_free_datagram_loc +@@ -3095,6 +3096,7 @@ static inline void skb_free_datagram_loc } int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags); int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len); diff --git a/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch b/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch index a26b1b526d..97f91e8643 100644 --- a/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch +++ b/target/linux/layerscape/patches-4.9/703-phy-support-layerscape.patch @@ -42,7 +42,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> config MDIO_GPIO tristate "GPIO lib-based bitbanged MDIO buses" depends on MDIO_BITBANG && GPIOLIB -@@ -298,6 +304,11 @@ config CICADA_PHY +@@ -299,6 +305,11 @@ config CICADA_PHY ---help--- Currently supports the cis8204 @@ -1695,7 +1695,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> EXPORT_SYMBOL(phy_ethtool_get_wol); --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1054,7 +1054,7 @@ int phy_suspend(struct phy_device *phyde +@@ -1055,7 +1055,7 @@ int phy_suspend(struct phy_device *phyde if (wol.wolopts) return -EBUSY; @@ -1704,7 +1704,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> ret = phydrv->suspend(phydev); if (ret) -@@ -1071,7 +1071,7 @@ int phy_resume(struct phy_device *phydev +@@ -1072,7 +1072,7 @@ int phy_resume(struct phy_device *phydev struct phy_driver *phydrv = to_phy_driver(phydev->mdio.dev.driver); int ret = 0; @@ -1713,7 +1713,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> ret = phydrv->resume(phydev); if (ret) -@@ -1728,7 +1728,7 @@ static int phy_remove(struct device *dev +@@ -1729,7 +1729,7 @@ static int phy_remove(struct device *dev phydev->state = PHY_DOWN; mutex_unlock(&phydev->lock); |