aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.10
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-03-22 12:07:50 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-03-27 18:59:53 +0200
commitf61c5cf76b9d13d9cc5962c4640ba14f28800215 (patch)
tree8e11d5bc9a2135e72e0365e5903e1f3bd7f36050 /target/linux/generic/hack-5.10
parenta4212b77c0a48904218093645008f176e65e79bb (diff)
downloadupstream-f61c5cf76b9d13d9cc5962c4640ba14f28800215.tar.gz
upstream-f61c5cf76b9d13d9cc5962c4640ba14f28800215.tar.bz2
upstream-f61c5cf76b9d13d9cc5962c4640ba14f28800215.zip
kernel: bump 5.10 to 5.10.176
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit f598880162e83ddc0139e00c5248497d06f5fff7)
Diffstat (limited to 'target/linux/generic/hack-5.10')
-rw-r--r--target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch b/target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch
index 8166b8a571..87f0f6e7ac 100644
--- a/target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch
+++ b/target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch
@@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1646,6 +1646,7 @@ enum netdev_priv_flags {
+@@ -1648,6 +1648,7 @@ enum netdev_priv_flags {
IFF_FAILOVER_SLAVE = 1<<28,
IFF_L3MDEV_RX_HANDLER = 1<<29,
IFF_LIVE_RENAME_OK = 1<<30,
@@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
};
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
-@@ -1678,6 +1679,7 @@ enum netdev_priv_flags {
+@@ -1680,6 +1681,7 @@ enum netdev_priv_flags {
#define IFF_FAILOVER_SLAVE IFF_FAILOVER_SLAVE
#define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER
#define IFF_LIVE_RENAME_OK IFF_LIVE_RENAME_OK
@@ -35,7 +35,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* Specifies the type of the struct net_device::ml_priv pointer */
enum netdev_ml_priv_type {
-@@ -2018,6 +2020,11 @@ struct net_device {
+@@ -2020,6 +2022,11 @@ struct net_device {
const struct tlsdev_ops *tlsdev_ops;
#endif
@@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
const struct header_ops *header_ops;
unsigned int flags;
-@@ -2108,6 +2115,10 @@ struct net_device {
+@@ -2110,6 +2117,10 @@ struct net_device {
struct mpls_dev __rcu *mpls_ptr;
#endif