From dc8cc446128776ee69571ff03925e6bd3256c2e0 Mon Sep 17 00:00:00 2001 From: Kabuli Chana Date: Tue, 23 Feb 2021 10:29:49 -0700 Subject: kernel: bump version 5.10 to 5.10.18 update kernel version, refresh current patchset Signed-off-by: Kabuli Chana [rebase/refresh] Signed-off-by: Adrian Schmutzler --- .../680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch') diff --git a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index cd1b30b4af..6d0c84c494 100644 --- a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -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 -@@ -5962,6 +5962,9 @@ static enum gro_result dev_gro_receive(s +@@ -5965,6 +5965,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; -@@ -7790,6 +7793,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7793,6 +7796,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, -@@ -7841,6 +7886,7 @@ static int __netdev_upper_dev_link(struc +@@ -7844,6 +7889,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); -@@ -7937,6 +7983,7 @@ static void __netdev_upper_dev_unlink(st +@@ -7940,6 +7986,7 @@ static void __netdev_upper_dev_unlink(st __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); -@@ -8723,6 +8770,7 @@ int dev_set_mac_address(struct net_devic +@@ -8726,6 +8773,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; -- cgit v1.2.3