diff options
| author | John Audia <therealgraysky@proton.me> | 2022-09-05 06:47:34 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-09-17 15:58:25 +0200 |
| commit | 1b0db300cbef371e3975250828f1450aebacec8f (patch) | |
| tree | 5918cd1f622202680ece5807c014f54006ba503d /target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch | |
| parent | bf65d2dcbab89076994df9c93d43423b8f31a471 (diff) | |
| download | upstream-1b0db300cbef371e3975250828f1450aebacec8f.tar.gz upstream-1b0db300cbef371e3975250828f1450aebacec8f.tar.bz2 upstream-1b0db300cbef371e3975250828f1450aebacec8f.zip | |
kernel: bump 5.10 to 5.10.141
All patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit e8a62a1e6040de71bdcb1be1a1c30c064acbc059)
Diffstat (limited to 'target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch')
| -rw-r--r-- | target/linux/generic/hack-5.10/721-net-add-packet-mangeling.patch | 12 |
1 files changed, 6 insertions, 6 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 9ad002e6a4..9c3cfb1885 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 -@@ -1625,6 +1625,7 @@ enum netdev_priv_flags { +@@ -1639,6 +1639,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 -@@ -1657,6 +1658,7 @@ enum netdev_priv_flags { +@@ -1671,6 +1672,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 { -@@ -1997,6 +1999,11 @@ struct net_device { +@@ -2011,6 +2013,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; -@@ -2087,6 +2094,10 @@ struct net_device { +@@ -2101,6 +2108,10 @@ struct net_device { struct mpls_dev __rcu *mpls_ptr; #endif @@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2710,6 +2710,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2718,6 +2718,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @skb: buffer to alter -@@ -2841,16 +2845,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2849,16 +2853,6 @@ static inline struct sk_buff *dev_alloc_ } |