diff options
| author | David S. Miller <davem@davemloft.net> | 2021-11-01 13:12:48 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-11-01 13:12:48 +0000 |
| commit | 7be49d242b8099a2489a6777dcfcb69f2e849fae (patch) | |
| tree | 341ed0733f7a68c500e4c7ff0197cc4f689afcae /net/ipv6/udp.c | |
| parent | 6de6e46d27ef386feecdbea56b3bfd6c3b3bc1f9 (diff) | |
| parent | b0ced8f290fb7bb03d23c4c3c3355e92a4be6e95 (diff) | |
Merge branch 'SO_MARK-routing'
Jakub Kicinski says:
====================
udp6: allow SO_MARK ctrl msg to affect routing
Looks like SO_MARK from cmsg does not affect routing policy.
This seems accidental.
I opted for net because of the discrepancy between IPv4
and IPv6, but it never worked and doesn't cause crashes..
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/udp.c')
| -rw-r--r-- | net/ipv6/udp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 8d785232b479..be6dc64ece29 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -1435,7 +1435,6 @@ do_udp_sendmsg: if (!fl6.flowi6_oif) fl6.flowi6_oif = np->sticky_pktinfo.ipi6_ifindex; - fl6.flowi6_mark = ipc6.sockc.mark; fl6.flowi6_uid = sk->sk_uid; if (msg->msg_controllen) { @@ -1471,6 +1470,7 @@ do_udp_sendmsg: ipc6.opt = opt; fl6.flowi6_proto = sk->sk_protocol; + fl6.flowi6_mark = ipc6.sockc.mark; fl6.daddr = *daddr; if (ipv6_addr_any(&fl6.saddr) && !ipv6_addr_any(&np->saddr)) fl6.saddr = np->saddr; |