aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2021-04-07 10:13:50 -0400
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2021-04-10 20:27:40 +0200
commitb0a34e886da1ccfa356133381cd3ab7a79f4c7b3 (patch)
treeab7fb617cfb92b21df4bfdf11368d9e10083aa00 /target/linux/generic/pending-5.4
parent558596bcd495c28ed8ca389ab47b6e0025f17f55 (diff)
downloadupstream-b0a34e886da1ccfa356133381cd3ab7a79f4c7b3.tar.gz
upstream-b0a34e886da1ccfa356133381cd3ab7a79f4c7b3.tar.bz2
upstream-b0a34e886da1ccfa356133381cd3ab7a79f4c7b3.zip
kernel: bump 5.4 to 5.4.110
Ran update_kernel.sh in a fresh clone without any existing toolchains. Manually rebased due to movement of rx-offload.c in 5.4.110: layerscape/patches-5.4/802-can-0002-can-rx-offload-fix-long-lines.patch layerscape/patches-5.4/802-can-0003-can-rx-offload-can_rx_offload_compare-fix-typo.patch layerscape/patches-5.4/802-can-0004-can-rx-offload-can_rx_offload_irq_offload_timestamp-.patch layerscape/patches-5.4/802-can-0005-can-rx-offload-can_rx_offload_reset-remove-no-op-fun.patch layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch layerscape/patches-5.4/802-can-0018-can-flexcan-use-struct-canfd_frame-for-CAN-classic-f.patch 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')
-rw-r--r--target/linux/generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch2
-rw-r--r--target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch4
2 files changed, 3 insertions, 3 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 47e12b0166..ac7a24a049 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
@@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1924,6 +1924,8 @@ struct net_device {
+@@ -1931,6 +1931,8 @@ struct net_device {
struct netdev_hw_addr_list mc;
struct netdev_hw_addr_list dev_addrs;
diff --git a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
index 6392b9d756..a6ef897869 100644
--- a/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
+++ b/target/linux/generic/pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch
@@ -50,7 +50,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
};
enum gro_result {
-@@ -2092,6 +2095,7 @@ struct net_device {
+@@ -2101,6 +2104,7 @@ struct net_device {
struct lock_class_key addr_list_lock_key;
bool proto_down;
unsigned wol_enabled:1;
@@ -58,7 +58,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
};
#define to_net_dev(d) container_of(d, struct net_device, dev)
-@@ -2249,6 +2253,26 @@ void netif_napi_add(struct net_device *d
+@@ -2281,6 +2285,26 @@ void netif_napi_add(struct net_device *d
int (*poll)(struct napi_struct *, int), int weight);
/**