From ad7c2b70e2e623e0e7608b0c7beadf1d6b42df9e Mon Sep 17 00:00:00 2001
From: Peter Kosyh <p.kosyh@gmail.com>
Date: Fri, 2 Jul 2010 07:47:55 +0000
Subject: [PATCH] --- yaml --- r: 200887 b: refs/heads/master c:
 44b451f1633896de15d2d52e1a2bd462e80b7814 h: refs/heads/master i:   200885:
 9280258a6ce1eafbfc4413d13279a4d6c4a476b7   200883:
 9c8e0a95990613a0514a8fffc1e9c4d45fde00d0   200879:
 1d6de3350d85b0245d6b388478c789bcc9e93512 v: v3

---
 [refs]                        | 2 +-
 trunk/net/ipv4/xfrm4_policy.c | 2 ++
 trunk/net/ipv6/xfrm6_policy.c | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 030cf637b819..c0349c1b67e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bd39456bd5ab16d2a956dd3d567dcac9c73a6c0
+refs/heads/master: 44b451f1633896de15d2d52e1a2bd462e80b7814
diff --git a/trunk/net/ipv4/xfrm4_policy.c b/trunk/net/ipv4/xfrm4_policy.c
index 1705476670ef..23883a48ebfb 100644
--- a/trunk/net/ipv4/xfrm4_policy.c
+++ b/trunk/net/ipv4/xfrm4_policy.c
@@ -108,6 +108,8 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
 	u8 *xprth = skb_network_header(skb) + iph->ihl * 4;
 
 	memset(fl, 0, sizeof(struct flowi));
+	fl->mark = skb->mark;
+
 	if (!(iph->frag_off & htons(IP_MF | IP_OFFSET))) {
 		switch (iph->protocol) {
 		case IPPROTO_UDP:
diff --git a/trunk/net/ipv6/xfrm6_policy.c b/trunk/net/ipv6/xfrm6_policy.c
index 4a0e77e14468..6baeabbbca82 100644
--- a/trunk/net/ipv6/xfrm6_policy.c
+++ b/trunk/net/ipv6/xfrm6_policy.c
@@ -124,6 +124,8 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
 	u8 nexthdr = nh[IP6CB(skb)->nhoff];
 
 	memset(fl, 0, sizeof(struct flowi));
+	fl->mark = skb->mark;
+
 	ipv6_addr_copy(&fl->fl6_dst, reverse ? &hdr->saddr : &hdr->daddr);
 	ipv6_addr_copy(&fl->fl6_src, reverse ? &hdr->daddr : &hdr->saddr);