aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/route.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4/route.c')
-rw-r--r--net/ipv4/route.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 925ee4dfc32c..4de3e38fa1a8 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1644,7 +1644,7 @@ static int ip_route_input_mc(struct sk_buff *skb, __be32 daddr, __be32 saddr,
1644 rth->rt_dst = daddr; 1644 rth->rt_dst = daddr;
1645 rth->fl.fl4_tos = tos; 1645 rth->fl.fl4_tos = tos;
1646#ifdef CONFIG_IP_ROUTE_FWMARK 1646#ifdef CONFIG_IP_ROUTE_FWMARK
1647 rth->fl.fl4_fwmark= skb->nfmark; 1647 rth->fl.fl4_fwmark= skb->mark;
1648#endif 1648#endif
1649 rth->fl.fl4_src = saddr; 1649 rth->fl.fl4_src = saddr;
1650 rth->rt_src = saddr; 1650 rth->rt_src = saddr;
@@ -1790,7 +1790,7 @@ static inline int __mkroute_input(struct sk_buff *skb,
1790 rth->rt_dst = daddr; 1790 rth->rt_dst = daddr;
1791 rth->fl.fl4_tos = tos; 1791 rth->fl.fl4_tos = tos;
1792#ifdef CONFIG_IP_ROUTE_FWMARK 1792#ifdef CONFIG_IP_ROUTE_FWMARK
1793 rth->fl.fl4_fwmark= skb->nfmark; 1793 rth->fl.fl4_fwmark= skb->mark;
1794#endif 1794#endif
1795 rth->fl.fl4_src = saddr; 1795 rth->fl.fl4_src = saddr;
1796 rth->rt_src = saddr; 1796 rth->rt_src = saddr;
@@ -1921,7 +1921,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
1921 .tos = tos, 1921 .tos = tos,
1922 .scope = RT_SCOPE_UNIVERSE, 1922 .scope = RT_SCOPE_UNIVERSE,
1923#ifdef CONFIG_IP_ROUTE_FWMARK 1923#ifdef CONFIG_IP_ROUTE_FWMARK
1924 .fwmark = skb->nfmark 1924 .fwmark = skb->mark
1925#endif 1925#endif
1926 } }, 1926 } },
1927 .iif = dev->ifindex }; 1927 .iif = dev->ifindex };
@@ -2035,7 +2035,7 @@ local_input:
2035 rth->rt_dst = daddr; 2035 rth->rt_dst = daddr;
2036 rth->fl.fl4_tos = tos; 2036 rth->fl.fl4_tos = tos;
2037#ifdef CONFIG_IP_ROUTE_FWMARK 2037#ifdef CONFIG_IP_ROUTE_FWMARK
2038 rth->fl.fl4_fwmark= skb->nfmark; 2038 rth->fl.fl4_fwmark= skb->mark;
2039#endif 2039#endif
2040 rth->fl.fl4_src = saddr; 2040 rth->fl.fl4_src = saddr;
2041 rth->rt_src = saddr; 2041 rth->rt_src = saddr;
@@ -2114,7 +2114,7 @@ int ip_route_input(struct sk_buff *skb, __be32 daddr, __be32 saddr,
2114 rth->fl.iif == iif && 2114 rth->fl.iif == iif &&
2115 rth->fl.oif == 0 && 2115 rth->fl.oif == 0 &&
2116#ifdef CONFIG_IP_ROUTE_FWMARK 2116#ifdef CONFIG_IP_ROUTE_FWMARK
2117 rth->fl.fl4_fwmark == skb->nfmark && 2117 rth->fl.fl4_fwmark == skb->mark &&
2118#endif 2118#endif
2119 rth->fl.fl4_tos == tos) { 2119 rth->fl.fl4_tos == tos) {
2120 rth->u.dst.lastuse = jiffies; 2120 rth->u.dst.lastuse = jiffies;