From f9f62d43e448f58d25749efa8b2aabc7f2d51e53 Mon Sep 17 00:00:00 2001 From: Koen Vandeputte Date: Mon, 9 Mar 2020 12:39:35 +0100 Subject: kernel: bump 5.4 to 5.4.24 Refreshed all patches. Compile-tested on: imx6 Runtime-tested on: imx6 Signed-off-by: Koen Vandeputte --- .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch') diff --git a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index b1b166a194..951be15610 100644 --- a/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1922,6 +1922,8 @@ struct net_device { +@@ -1924,6 +1924,8 @@ struct net_device { struct netdev_hw_addr_list mc; struct netdev_hw_addr_list dev_addrs; @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -5477,6 +5477,9 @@ static enum gro_result dev_gro_receive(s +@@ -5458,6 +5458,9 @@ static enum gro_result dev_gro_receive(s int same_flow; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau if (netif_elide_gro(skb->dev)) goto normal; -@@ -7269,6 +7272,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7251,6 +7254,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info, -@@ -7319,6 +7364,7 @@ static int __netdev_upper_dev_link(struc +@@ -7301,6 +7346,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -7412,6 +7458,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -7394,6 +7440,7 @@ void netdev_upper_dev_unlink(struct net_ __netdev_adjacent_dev_unlink_neighbour(dev, upper_dev); @@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); -@@ -8142,6 +8189,7 @@ int dev_set_mac_address(struct net_devic +@@ -8124,6 +8171,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; -- cgit v1.2.3