aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.14
diff options
context:
space:
mode:
authorDavid Bauer <mail@david-bauer.net>2021-08-12 23:33:05 +0200
committerDavid Bauer <mail@david-bauer.net>2021-08-14 14:49:18 +0200
commit7378c949270067d0a633cfd892b9dd6416581afa (patch)
tree2bfbe3b1af9979ca52e69fe26563cf0d5f41c6f7 /target/linux/layerscape/patches-4.14
parentcfc1602a1e4e013959997d15bcfa89583e9ae53f (diff)
downloadupstream-7378c949270067d0a633cfd892b9dd6416581afa.tar.gz
upstream-7378c949270067d0a633cfd892b9dd6416581afa.tar.bz2
upstream-7378c949270067d0a633cfd892b9dd6416581afa.zip
kernel: bump to 4.14.243
Compile-tested: x86-64 Run-tested: x86-64 Signed-off-by: David Bauer <mail@david-bauer.net>
Diffstat (limited to 'target/linux/layerscape/patches-4.14')
-rw-r--r--target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
index eb412af778..083a518bba 100644
--- a/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
+++ b/target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
@@ -580,7 +580,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
void __kfree_skb(struct sk_buff *skb);
extern struct kmem_cache *skbuff_head_cache;
-@@ -3344,6 +3345,7 @@ static inline void skb_free_datagram_loc
+@@ -3353,6 +3354,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);
@@ -713,7 +713,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
}
#ifdef CONFIG_NET_INGRESS
-@@ -6346,7 +6347,15 @@ static int __netdev_upper_dev_link(struc
+@@ -6347,7 +6348,15 @@ static int __netdev_upper_dev_link(struc
struct net_device *upper_dev, bool master,
void *upper_priv, void *upper_info)
{
@@ -730,7 +730,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
int ret = 0;
ASSERT_RTNL();
-@@ -6364,12 +6373,7 @@ static int __netdev_upper_dev_link(struc
+@@ -6365,12 +6374,7 @@ static int __netdev_upper_dev_link(struc
if (master && netdev_master_upper_dev_get(dev))
return -EBUSY;
@@ -744,7 +744,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
&changeupper_info.info);
ret = notifier_to_errno(ret);
if (ret)
-@@ -6381,7 +6385,7 @@ static int __netdev_upper_dev_link(struc
+@@ -6382,7 +6386,7 @@ static int __netdev_upper_dev_link(struc
return ret;
netdev_update_addr_mask(dev);
@@ -753,7 +753,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
&changeupper_info.info);
ret = notifier_to_errno(ret);
if (ret)
-@@ -6445,21 +6449,25 @@ EXPORT_SYMBOL(netdev_master_upper_dev_li
+@@ -6446,21 +6450,25 @@ EXPORT_SYMBOL(netdev_master_upper_dev_li
void netdev_upper_dev_unlink(struct net_device *dev,
struct net_device *upper_dev)
{
@@ -784,7 +784,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
&changeupper_info.info);
}
EXPORT_SYMBOL(netdev_upper_dev_unlink);
-@@ -6475,11 +6483,13 @@ EXPORT_SYMBOL(netdev_upper_dev_unlink);
+@@ -6476,11 +6484,13 @@ EXPORT_SYMBOL(netdev_upper_dev_unlink);
void netdev_bonding_info_change(struct net_device *dev,
struct netdev_bonding_info *bonding_info)
{
@@ -800,7 +800,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
&info.info);
}
EXPORT_SYMBOL(netdev_bonding_info_change);
-@@ -6605,11 +6615,13 @@ EXPORT_SYMBOL(dev_get_nest_level);
+@@ -6606,11 +6616,13 @@ EXPORT_SYMBOL(dev_get_nest_level);
void netdev_lower_state_changed(struct net_device *lower_dev,
void *lower_state_info)
{
@@ -816,7 +816,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
&changelowerstate_info.info);
}
EXPORT_SYMBOL(netdev_lower_state_changed);
-@@ -6900,11 +6912,14 @@ void __dev_notify_flags(struct net_devic
+@@ -6901,11 +6913,14 @@ void __dev_notify_flags(struct net_devic
if (dev->flags & IFF_UP &&
(changes & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI | IFF_VOLATILE))) {