diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2024-04-13 17:48:42 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2024-04-14 18:03:37 +0200 |
| commit | 2909cce1b279df641d435d3cbbcc478f8330d2df (patch) | |
| tree | 2dbe3765b7ba6856850ae3d9dae434fc0e3db4d3 /target/linux/generic/pending-6.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | |
| parent | 1a44a260fe2ed2f74f134c4bbc34883c2b1efdda (diff) | |
| download | openwrt-2909cce1b279df641d435d3cbbcc478f8330d2df.tar.gz openwrt-2909cce1b279df641d435d3cbbcc478f8330d2df.tar.bz2 openwrt-2909cce1b279df641d435d3cbbcc478f8330d2df.zip | |
kernel: bump 6.1 to 6.1.86
Removed upstreamed:
bcm27xx/patches-6.1/950-1235-drm-vc4-don-t-check-if-plane-state-fb-state-fb.patch [1]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.86&id=48bfb4b03c5ff6e1fa1dc73fb915e150b0968c40
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic/pending-6.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch')
| -rw-r--r-- | target/linux/generic/pending-6.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-6.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch b/target/linux/generic/pending-6.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch index a1b32c352b..a589fca7a8 100644 --- a/target/linux/generic/pending-6.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch +++ b/target/linux/generic/pending-6.1/680-NET-skip-GRO-for-foreign-MAC-addresses.patch @@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #endif --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -972,6 +972,7 @@ struct sk_buff { +@@ -967,6 +967,7 @@ struct sk_buff { #ifdef CONFIG_IPV6_NDISC_NODETYPE __u8 ndisc_nodetype:2; #endif @@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> __u8 inner_protocol_type:1; --- a/net/core/gro.c +++ b/net/core/gro.c -@@ -491,6 +491,9 @@ static enum gro_result dev_gro_receive(s +@@ -492,6 +492,9 @@ static enum gro_result dev_gro_receive(s int same_flow; int grow; |