| Message ID | 20210709152823.2220-1-ovov@yandex-team.ru (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 43b90bfad34bcb81b8a5bc7dc650800f4be1787e |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2] net: send SYNACK packet with accepted fwmark | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | fail | 1 blamed authors not CCed: lorenzo@google.com; 4 maintainers not CCed: yoshfuji@linux-ipv6.org dsahern@kernel.org lorenzo@google.com kuba@kernel.org |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 2 this patch: 2 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 2 this patch: 2 |
| netdev/header_inline | success | Link |
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Fri, 9 Jul 2021 18:28:23 +0300 you wrote: > commit e05a90ec9e16 ("net: reflect mark on tcp syn ack packets") > fixed IPv4 only. > > This part is for the IPv6 side. > > Fixes: e05a90ec9e16 ("net: reflect mark on tcp syn ack packets") > Signed-off-by: Alexander Ovechkin <ovov@yandex-team.ru> > Acked-by: Dmitry Yakunin <zeil@yandex-team.ru> > Reviewed-by: Eric Dumazet <edumazet@google.com> > > [...] Here is the summary with links: - [v2] net: send SYNACK packet with accepted fwmark https://git.kernel.org/netdev/net/c/43b90bfad34b You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 323989927a0a..0ce52d46e4f8 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -555,7 +555,7 @@ static int tcp_v6_send_synack(const struct sock *sk, struct dst_entry *dst, opt = ireq->ipv6_opt; if (!opt) opt = rcu_dereference(np->opt); - err = ip6_xmit(sk, skb, fl6, sk->sk_mark, opt, + err = ip6_xmit(sk, skb, fl6, skb->mark ? : sk->sk_mark, opt, tclass, sk->sk_priority); rcu_read_unlock(); err = net_xmit_eval(err);
commit e05a90ec9e16 ("net: reflect mark on tcp syn ack packets") fixed IPv4 only. This part is for the IPv6 side. Fixes: e05a90ec9e16 ("net: reflect mark on tcp syn ack packets") Signed-off-by: Alexander Ovechkin <ovov@yandex-team.ru> Acked-by: Dmitry Yakunin <zeil@yandex-team.ru> Reviewed-by: Eric Dumazet <edumazet@google.com> --- net/ipv6/tcp_ipv6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)