diff options
| author | Felix Fietkau <nbd@nbd.name> | 2023-11-17 17:59:29 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2023-12-08 14:29:54 +0100 |
| commit | 6407ef8d2bcb4a0a6284de09cd77bd1868c1d6ea (patch) | |
| tree | 3ac06a7a371a68205e76b0bcf62e09ef0608dea6 /target/linux/generic/hack-6.1 | |
| parent | 0c1cffd00ecbf3dde3c7f6437920bd41e6e268e5 (diff) | |
kernel: backport upstream mediatek WED changes
Reorder and update existing patches
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/generic/hack-6.1')
| -rw-r--r-- | target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch b/target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch index 8f940797c5..9ce8f82af0 100644 --- a/target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch +++ b/target/linux/generic/hack-6.1/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 -@@ -1706,6 +1706,7 @@ enum netdev_priv_flags { +@@ -1707,6 +1707,7 @@ enum netdev_priv_flags { /* was IFF_LIVE_RENAME_OK */ IFF_TX_SKB_NO_LINEAR = BIT_ULL(31), IFF_CHANGE_PROTO_DOWN = BIT_ULL(32), @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> }; #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN -@@ -1739,6 +1740,7 @@ enum netdev_priv_flags { +@@ -1740,6 +1741,7 @@ enum netdev_priv_flags { #define IFF_FAILOVER_SLAVE IFF_FAILOVER_SLAVE #define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER #define IFF_TX_SKB_NO_LINEAR IFF_TX_SKB_NO_LINEAR @@ -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 { -@@ -2107,6 +2109,11 @@ struct net_device { +@@ -2108,6 +2110,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 char operstate; -@@ -2182,6 +2189,10 @@ struct net_device { +@@ -2183,6 +2190,10 @@ struct net_device { struct mctp_dev __rcu *mctp_ptr; #endif |