diff options
| author | John Audia <therealgraysky@proton.me> | 2022-10-27 06:26:25 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-11-01 13:56:10 +0100 |
| commit | 0667688a406affbde9a2f6e2e6e07dbd0e3810b1 (patch) | |
| tree | e9ad64ac22874d61ea008617aa1af9287c269a5f /target/linux/generic/pending-5.10 | |
| parent | fe58ee905755512da865aad4543da526a7adc2d4 (diff) | |
| download | upstream-0667688a406affbde9a2f6e2e6e07dbd0e3810b1.tar.gz upstream-0667688a406affbde9a2f6e2e6e07dbd0e3810b1.tar.bz2 upstream-0667688a406affbde9a2f6e2e6e07dbd0e3810b1.zip | |
kernel: bump 5.10 to 5.10.150
Manually rebased:
bcm53xx/patches-5.10/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
All patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
[Move gro_skip in 680-NET-skip-GRO-for-foreign-MAC-addresses.patch to old position]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit aa2fa2eb76f13e48cd39d844dca34627da00cb5d)
Diffstat (limited to 'target/linux/generic/pending-5.10')
| -rw-r--r-- | target/linux/generic/pending-5.10/655-increase_skb_pad.patch | 2 | ||||
| -rw-r--r-- | target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/pending-5.10/655-increase_skb_pad.patch b/target/linux/generic/pending-5.10/655-increase_skb_pad.patch index b9c463d570..4ad6eb9d78 100644 --- a/target/linux/generic/pending-5.10/655-increase_skb_pad.patch +++ b/target/linux/generic/pending-5.10/655-increase_skb_pad.patch @@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2684,7 +2684,7 @@ static inline int pskb_network_may_pull( +@@ -2686,7 +2686,7 @@ static inline int pskb_network_may_pull( * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ #ifndef NET_SKB_PAD diff --git a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index 5537e3081e..c9d5a805b8 100644 --- a/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-5.10/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -22,10 +22,10 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #endif --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -858,6 +858,7 @@ struct sk_buff { - #ifdef CONFIG_TLS_DEVICE +@@ -860,6 +860,7 @@ struct sk_buff { __u8 decrypted:1; #endif + __u8 scm_io_uring:1; + __u8 gro_skip:1; #ifdef CONFIG_NET_SCHED |