diff options
| author | John Audia <graysky@archlinux.us> | 2021-04-07 10:13:50 -0400 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-04-10 20:27:40 +0200 |
| commit | b0a34e886da1ccfa356133381cd3ab7a79f4c7b3 (patch) | |
| tree | ab7fb617cfb92b21df4bfdf11368d9e10083aa00 /target/linux/generic/hack-5.4/721-phy_packets.patch | |
| parent | 558596bcd495c28ed8ca389ab47b6e0025f17f55 (diff) | |
| download | upstream-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/hack-5.4/721-phy_packets.patch')
| -rw-r--r-- | target/linux/generic/hack-5.4/721-phy_packets.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/hack-5.4/721-phy_packets.patch b/target/linux/generic/hack-5.4/721-phy_packets.patch index 55233369ef..836fc54ba2 100644 --- a/target/linux/generic/hack-5.4/721-phy_packets.patch +++ b/target/linux/generic/hack-5.4/721-phy_packets.patch @@ -29,9 +29,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #define IFF_LIVE_RENAME_OK IFF_LIVE_RENAME_OK +#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN - /** - * struct net_device - The DEVICE structure. -@@ -1882,6 +1884,11 @@ struct net_device { + /* Specifies the type of the struct net_device::ml_priv pointer */ + enum netdev_ml_priv_type { +@@ -1889,6 +1891,11 @@ struct net_device { const struct tlsdev_ops *tlsdev_ops; #endif @@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> const struct header_ops *header_ops; unsigned int flags; -@@ -1964,6 +1971,10 @@ struct net_device { +@@ -1971,6 +1978,10 @@ struct net_device { struct mpls_dev __rcu *mpls_ptr; #endif |