From 4e972cf09bef4fc24d06977b5bd202d96f988c78 Mon Sep 17 00:00:00 2001
From: Atis Elsts <atis@mikrotik.com>
Date: Thu, 1 Oct 2009 15:16:49 -0700
Subject: [PATCH] --- yaml --- r: 166724 b: refs/heads/master c:
 914a9ab386a288d0f22252fc268ecbc048cdcbd5 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/af_inet.c   | 1 +
 trunk/net/ipv4/ip_output.c | 1 +
 trunk/net/ipv4/udp.c       | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 974b3c6eb1fe..878bcbd09c30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66466797c7e2406579724e42eb9cfe05d53a882b
+refs/heads/master: 914a9ab386a288d0f22252fc268ecbc048cdcbd5
diff --git a/trunk/net/ipv4/af_inet.c b/trunk/net/ipv4/af_inet.c
index 58c4b0f7c4aa..57737b8d1711 100644
--- a/trunk/net/ipv4/af_inet.c
+++ b/trunk/net/ipv4/af_inet.c
@@ -1119,6 +1119,7 @@ int inet_sk_rebuild_header(struct sock *sk)
 {
 	struct flowi fl = {
 		.oif = sk->sk_bound_dev_if,
+		.mark = sk->sk_mark,
 		.nl_u = {
 			.ip4_u = {
 				.daddr	= daddr,
diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c
index 9fe5d7b81580..f9895180f481 100644
--- a/trunk/net/ipv4/ip_output.c
+++ b/trunk/net/ipv4/ip_output.c
@@ -335,6 +335,7 @@ int ip_queue_xmit(struct sk_buff *skb, int ipfragok)
 
 		{
 			struct flowi fl = { .oif = sk->sk_bound_dev_if,
+					    .mark = sk->sk_mark,
 					    .nl_u = { .ip4_u =
 						      { .daddr = daddr,
 							.saddr = inet->saddr,
diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c
index 3326aff65906..6ec6a8a4a224 100644
--- a/trunk/net/ipv4/udp.c
+++ b/trunk/net/ipv4/udp.c
@@ -696,6 +696,7 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
 
 	if (rt == NULL) {
 		struct flowi fl = { .oif = ipc.oif,
+				    .mark = sk->sk_mark,
 				    .nl_u = { .ip4_u =
 					      { .daddr = faddr,
 						.saddr = saddr,