diff options
| author | Felix Fietkau <nbd@nbd.name> | 2023-09-04 15:28:59 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2023-09-04 15:29:35 +0200 |
| commit | 77c45ddd86b0dff7765e30f7846cbdef34fa93ce (patch) | |
| tree | 09c74492f785b4dde1b338743df8bcbd720915ef /target/linux/generic/hack-6.1 | |
| parent | 8554a4a7e37998bd214666d2ab7e469ce7c8757e (diff) | |
kernel: backport support for renaming netdevs while up
Will be used in upcoming hostapd changes
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 | 14 |
1 files changed, 7 insertions, 7 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 91dc3e0110..bfb4f50e79 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,23 +19,23 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1707,6 +1707,7 @@ enum netdev_priv_flags { - IFF_LIVE_RENAME_OK = 1<<30, +@@ -1706,6 +1706,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), + IFF_NO_IP_ALIGN = BIT_ULL(33), }; #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN -@@ -1741,6 +1742,7 @@ enum netdev_priv_flags { +@@ -1739,6 +1740,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 #define IFF_TX_SKB_NO_LINEAR IFF_TX_SKB_NO_LINEAR +#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN /* Specifies the type of the struct net_device::ml_priv pointer */ enum netdev_ml_priv_type { -@@ -2109,6 +2111,11 @@ struct net_device { +@@ -2107,6 +2109,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; -@@ -2184,6 +2191,10 @@ struct net_device { +@@ -2182,6 +2189,10 @@ struct net_device { struct mctp_dev __rcu *mctp_ptr; #endif @@ -105,7 +105,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -3590,6 +3590,11 @@ static int xmit_one(struct sk_buff *skb, +@@ -3575,6 +3575,11 @@ static int xmit_one(struct sk_buff *skb, if (dev_nit_active(dev)) dev_queue_xmit_nit(skb, dev); |