Merge ra.kernel.org:/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-block.git] / net / ipv6 / udp.c

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 5995fdc99d3f3ef7b4f9cf59914976d248f28349..aae4938f3deab284ecfd78f0c601647fbb9b03d4 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1231,6 +1231,7 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
        ipcm6_init(&ipc6);
        ipc6.gso_size = up->gso_size;
        ipc6.sockc.tsflags = sk->sk_tsflags;
+       ipc6.sockc.mark = sk->sk_mark;
 
        /* destination address check */
        if (sin6) {
@@ -1353,7 +1354,7 @@ do_udp_sendmsg:
        if (!fl6.flowi6_oif)
                fl6.flowi6_oif = np->sticky_pktinfo.ipi6_ifindex;
 
-       fl6.flowi6_mark = sk->sk_mark;
+       fl6.flowi6_mark = ipc6.sockc.mark;
        fl6.flowi6_uid = sk->sk_uid;
 
        if (msg->msg_controllen) {