diff options
| author | Felix Fietkau <nbd@nbd.name> | 2021-06-01 23:19:48 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2021-06-01 23:20:07 +0200 |
| commit | 9bda91d805b02ba3d3a6481bee31f4569e3c2324 (patch) | |
| tree | 320d74e65ba1b5dadf6817579ff6bb65733f25c8 /target/linux/generic/pending-5.10 | |
| parent | 507257778c733749816a8ca611f072d07916a918 (diff) | |
| download | upstream-9bda91d805b02ba3d3a6481bee31f4569e3c2324.tar.gz upstream-9bda91d805b02ba3d3a6481bee31f4569e3c2324.tar.bz2 upstream-9bda91d805b02ba3d3a6481bee31f4569e3c2324.zip | |
kernel: backport fix for hang on napi_disable with threaded NAPI
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/pending-5.10')
| -rw-r--r-- | target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 8 |
1 files changed, 4 insertions, 4 deletions
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 8b5ec9c305..3b485e3cc9 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 @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (netif_elide_gro(skb->dev)) goto normal; -@@ -7986,6 +7989,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7987,6 +7990,48 @@ static void __netdev_adjacent_dev_unlink &upper_dev->adj_list.lower); } @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> static int __netdev_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, bool master, void *upper_priv, void *upper_info, -@@ -8037,6 +8082,7 @@ static int __netdev_upper_dev_link(struc +@@ -8038,6 +8083,7 @@ static int __netdev_upper_dev_link(struc if (ret) return ret; @@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); ret = notifier_to_errno(ret); -@@ -8133,6 +8179,7 @@ static void __netdev_upper_dev_unlink(st +@@ -8134,6 +8180,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 <nbd@nbd.name> call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); -@@ -8919,6 +8966,7 @@ int dev_set_mac_address(struct net_devic +@@ -8920,6 +8967,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; |