diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-06 19:29:39 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-07 01:10:53 +0100 |
| commit | 0b7311300b01d9975e9996327ee469e4f66fb2ec (patch) | |
| tree | 69c7696ae97c3478df893c55458759a8dc0032ba /target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | |
| parent | 2f04012b20515eec74563de74d0528e603aa6f89 (diff) | |
| download | upstream-0b7311300b01d9975e9996327ee469e4f66fb2ec.tar.gz upstream-0b7311300b01d9975e9996327ee469e4f66fb2ec.tar.bz2 upstream-0b7311300b01d9975e9996327ee469e4f66fb2ec.zip | |
kernel: bump 5.4 to 5.4.158
Removed upstreamed:
generic/backport-5.4/790-v5.7-net-switchdev-do-not-propagate-bridge-updates-across.patch
All others updated automatically.
Compile-tested on: lantiq/xrx200, armvirt/64
Runtime-tested on: lantiq/xrx200, armvirt/64
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 | 10 |
1 files changed, 5 insertions, 5 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 4839ac5e70..e0540866c6 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 @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> __u16 tc_index; /* traffic control index */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -5489,6 +5489,9 @@ static enum gro_result dev_gro_receive(s +@@ -5495,6 +5495,9 @@ static enum gro_result dev_gro_receive(s int same_flow; int grow; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (netif_elide_gro(skb->dev)) goto normal; -@@ -7291,6 +7294,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7297,6 +7300,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, -@@ -7341,6 +7386,7 @@ static int __netdev_upper_dev_link(struc +@@ -7347,6 +7392,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); -@@ -7434,6 +7480,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -7440,6 +7486,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); -@@ -8164,6 +8211,7 @@ int dev_set_mac_address(struct net_devic +@@ -8170,6 +8217,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; |