diff options
| author | Petr Štetiar <ynezz@true.cz> | 2020-04-07 10:08:16 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2020-04-09 00:12:46 +0200 |
| commit | b299002877c801202c3b61d5e09865e88f506176 (patch) | |
| tree | cf1d30e16b53a53e4d04630527f67b01eac38181 /target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | |
| parent | 196cab719f8f318ec771e5f1a07728c12b7fa207 (diff) | |
| download | upstream-b299002877c801202c3b61d5e09865e88f506176.tar.gz upstream-b299002877c801202c3b61d5e09865e88f506176.tar.bz2 upstream-b299002877c801202c3b61d5e09865e88f506176.zip | |
kernel: bump 5.4 to 5.4.31
Refreshed patches, removed upstreamed patches:
oxnas: 003-ARM-dts-oxnas-Fix-clear-mask-property.patch
generic: 184-USB-serial-option-add-Wistron-Neweb-D19Q1.patch
Run tested: apu2, qemu-x86-64, apalis
Build tested: sunxi/a53, imx6, x86/64, ipq40xx
Tested-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> [apu2]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
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 | 12 |
1 files changed, 6 insertions, 6 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 951be15610..d34ba6a569 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 @@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #endif --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -822,6 +822,7 @@ struct sk_buff { +@@ -824,6 +824,7 @@ struct sk_buff { #ifdef CONFIG_TLS_DEVICE __u8 decrypted:1; #endif @@ -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 -@@ -5458,6 +5458,9 @@ static enum gro_result dev_gro_receive(s +@@ -5460,6 +5460,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; -@@ -7251,6 +7254,48 @@ static void __netdev_adjacent_dev_unlink +@@ -7253,6 +7256,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, -@@ -7301,6 +7346,7 @@ static int __netdev_upper_dev_link(struc +@@ -7303,6 +7348,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); -@@ -7394,6 +7440,7 @@ void netdev_upper_dev_unlink(struct net_ +@@ -7396,6 +7442,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); -@@ -8124,6 +8171,7 @@ int dev_set_mac_address(struct net_devic +@@ -8126,6 +8173,7 @@ int dev_set_mac_address(struct net_devic if (err) return err; dev->addr_assign_type = NET_ADDR_SET; |