diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-06-03 11:12:02 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-06-06 00:24:07 +0200 |
| commit | da77b9c2f185db72a2917aa2e18f0c8bb164d3c4 (patch) | |
| tree | 551fa58dd9559b2feab093df8bb43607df3dfb21 /target/linux/generic/backport-5.10/610-v5.13-04-netfilter-flowtable-consolidate-skb_try_make_writabl.patch | |
| parent | 6f648ed7e639060902df1d652fedd176f4aa9f98 (diff) | |
| download | upstream-da77b9c2f185db72a2917aa2e18f0c8bb164d3c4.tar.gz upstream-da77b9c2f185db72a2917aa2e18f0c8bb164d3c4.tar.bz2 upstream-da77b9c2f185db72a2917aa2e18f0c8bb164d3c4.zip | |
kernel: bump 5.10 to 5.10.42
Deleted (reverse-appliable):
generic/pending-5.10/110-perf-jevents-fix-getting-maximum-number-of-fds.patch
Manually refreshed:
ramips/patches-5.10/835-asoc-add-mt7620-support.patch
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/backport-5.10/610-v5.13-04-netfilter-flowtable-consolidate-skb_try_make_writabl.patch')
| -rw-r--r-- | target/linux/generic/backport-5.10/610-v5.13-04-netfilter-flowtable-consolidate-skb_try_make_writabl.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/backport-5.10/610-v5.13-04-netfilter-flowtable-consolidate-skb_try_make_writabl.patch b/target/linux/generic/backport-5.10/610-v5.13-04-netfilter-flowtable-consolidate-skb_try_make_writabl.patch index 2a4ecbaf53..9fd01b465e 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-04-netfilter-flowtable-consolidate-skb_try_make_writabl.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-04-netfilter-flowtable-consolidate-skb_try_make_writabl.patch @@ -14,7 +14,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- a/net/netfilter/nf_flow_table_core.c +++ b/net/netfilter/nf_flow_table_core.c -@@ -395,9 +395,6 @@ static int nf_flow_nat_port_tcp(struct s +@@ -394,9 +394,6 @@ static int nf_flow_nat_port_tcp(struct s { struct tcphdr *tcph; @@ -24,7 +24,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> tcph = (void *)(skb_network_header(skb) + thoff); inet_proto_csum_replace2(&tcph->check, skb, port, new_port, false); -@@ -409,9 +406,6 @@ static int nf_flow_nat_port_udp(struct s +@@ -408,9 +405,6 @@ static int nf_flow_nat_port_udp(struct s { struct udphdr *udph; @@ -34,7 +34,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> udph = (void *)(skb_network_header(skb) + thoff); if (udph->check || skb->ip_summed == CHECKSUM_PARTIAL) { inet_proto_csum_replace2(&udph->check, skb, port, -@@ -447,9 +441,6 @@ int nf_flow_snat_port(const struct flow_ +@@ -446,9 +440,6 @@ int nf_flow_snat_port(const struct flow_ struct flow_ports *hdr; __be16 port, new_port; @@ -44,7 +44,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> hdr = (void *)(skb_network_header(skb) + thoff); switch (dir) { -@@ -478,9 +469,6 @@ int nf_flow_dnat_port(const struct flow_ +@@ -477,9 +468,6 @@ int nf_flow_dnat_port(const struct flow_ struct flow_ports *hdr; __be16 port, new_port; |