diff options
author | John Audia <graysky@archlinux.us> | 2021-07-19 05:17:10 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-25 13:52:38 +0200 |
commit | 5408e811b29643e3fd5f2cd227f17263daa45a74 (patch) | |
tree | c41b5db75482b8a16c092183206a60c13b2e1173 /target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | |
parent | 2b2ac841e022054ff3390f25fa41336467530a91 (diff) | |
download | upstream-5408e811b29643e3fd5f2cd227f17263daa45a74.tar.gz upstream-5408e811b29643e3fd5f2cd227f17263daa45a74.tar.bz2 upstream-5408e811b29643e3fd5f2cd227f17263daa45a74.zip |
kernel: bump 5.4 to 5.4.133
Manually rebased:
pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch')
-rw-r--r-- | target/linux/generic/pending-5.4/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.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 8871f3457a..4839ac5e70 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 @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (netif_elide_gro(skb->dev)) goto normal; -@@ -7284,6 +7287,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7291,6 +7294,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, -@@ -7334,6 +7379,7 @@ static int __netdev_upper_dev_link(struc +@@ -7341,6 +7386,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); -@@ -7427,6 +7473,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -7434,6 +7480,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 <nbd@nbd.name> call_netdevice_notifiers_info(NETDEV_CHANGEUPPER, &changeupper_info.info); -@@ -8157,6 +8204,7 @@ int dev_set_mac_address(struct net_devic +@@ -8164,6 +8211,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; |