ip: support SO_MARK cmsg

[sfrench/cifs-2.6.git] / net / ipv4 / ip_output.c

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index cc7ef0d05bbd2baf4f4a1b8f9a8fe4f56b901f77..5eb73775c3f7da2014bd658980d10d8a22960b6b 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1266,6 +1266,7 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork,
        cork->length = 0;
        cork->ttl = ipc->ttl;
        cork->tos = ipc->tos;
+       cork->mark = ipc->sockc.mark;
        cork->priority = ipc->priority;
        cork->transmit_time = ipc->sockc.transmit_time;
        cork->tx_flags = 0;
@@ -1529,7 +1530,7 @@ struct sk_buff *__ip_make_skb(struct sock *sk,
        }
 
        skb->priority = (cork->tos != -1) ? cork->priority: sk->sk_priority;
-       skb->mark = sk->sk_mark;
+       skb->mark = cork->mark;
        skb->tstamp = cork->transmit_time;
        /*
         * Steal rt from cork.dst to avoid a pair of atomic_inc/atomic_dec