4 files changed, 3 insertions, 10 deletions

diff --git a/include/net/route.h b/include/net/route.h
index 85d1093e42de..757fe40b6cea 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -52,7 +52,6 @@ struct rtable {
         int                     rt_route_iif;
         int                     rt_iif;
         int                     rt_oif;
-        __u32                   rt_mark;
 
         /* Info on neighbour */
         __be32                  rt_gateway;
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 5716c6b808d6..eee3bf6676fe 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1797,7 +1797,7 @@ static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct sk_buff *skb)
                 .flowi4_tos = RT_TOS(iph->tos),
                 .flowi4_oif = rt->rt_oif,
                 .flowi4_iif = rt->rt_iif,
-                .flowi4_mark = rt->rt_mark,
+                .flowi4_mark = skb->mark,
         };
         struct mr_table *mrt;
         int err;
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index fc1199dc23e7..264617c98c25 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1275,7 +1275,6 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
         rth->rt_route_iif = dev->ifindex;
         rth->rt_iif     = dev->ifindex;
         rth->rt_oif     = 0;
-        rth->rt_mark    = skb->mark;
         rth->rt_pmtu    = 0;
         rth->rt_gateway = daddr;
         rth->fi = NULL;
@@ -1395,7 +1394,6 @@ static int __mkroute_input(struct sk_buff *skb,
         rth->rt_route_iif = in_dev->dev->ifindex;
         rth->rt_iif     = in_dev->dev->ifindex;
         rth->rt_oif     = 0;
-        rth->rt_mark    = skb->mark;
         rth->rt_pmtu    = 0;
         rth->rt_gateway = daddr;
         rth->fi = NULL;
@@ -1562,7 +1560,6 @@ local_input:
         rth->rt_route_iif = dev->ifindex;
         rth->rt_iif     = dev->ifindex;
         rth->rt_oif     = 0;
-        rth->rt_mark    = skb->mark;
         rth->rt_pmtu    = 0;
         rth->rt_gateway = daddr;
         rth->fi = NULL;
@@ -1714,7 +1711,6 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
         rth->rt_route_iif = 0;
         rth->rt_iif     = orig_oif ? : dev_out->ifindex;
         rth->rt_oif     = orig_oif;
-        rth->rt_mark    = fl4->flowi4_mark;
         rth->rt_pmtu    = 0;
         rth->rt_gateway = fl4->daddr;
         rth->fi = NULL;
@@ -1994,7 +1990,6 @@ struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_or
                 rt->rt_route_iif = ort->rt_route_iif;
                 rt->rt_iif = ort->rt_iif;
                 rt->rt_oif = ort->rt_oif;
-                rt->rt_mark = ort->rt_mark;
                 rt->rt_pmtu = ort->rt_pmtu;
 
                 rt->rt_genid = rt_genid(net);
@@ -2091,8 +2086,8 @@ static int rt_fill_info(struct net *net,  __be32 src, struct flowi4 *fl4,
         if (rtnetlink_put_metrics(skb, metrics) < 0)
                 goto nla_put_failure;
 
-        if (rt->rt_mark &&
-            nla_put_be32(skb, RTA_MARK, rt->rt_mark))
+        if (fl4->flowi4_mark &&
+            nla_put_be32(skb, RTA_MARK, fl4->flowi4_mark))
                 goto nla_put_failure;
 
         error = rt->dst.error;
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
index 00d49e415113..f73ba8210bd3 100644
--- a/net/ipv4/xfrm4_policy.c
+++ b/net/ipv4/xfrm4_policy.c
@@ -82,7 +82,6 @@ static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
         xdst->u.rt.rt_route_iif = fl4->flowi4_iif;
         xdst->u.rt.rt_iif = fl4->flowi4_iif;
         xdst->u.rt.rt_oif = fl4->flowi4_oif;
-        xdst->u.rt.rt_mark = fl4->flowi4_mark;
 
         xdst->u.dst.dev = dev;
         dev_hold(dev);