diff options
Diffstat (limited to 'net/ipv6/route.c')
-rw-r--r-- | net/ipv6/route.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 6ebdb7b6744c..f23fbd28a501 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -1176,7 +1176,7 @@ void ip6_update_pmtu(struct sk_buff *skb, struct net *net, __be32 mtu, | |||
1176 | 1176 | ||
1177 | memset(&fl6, 0, sizeof(fl6)); | 1177 | memset(&fl6, 0, sizeof(fl6)); |
1178 | fl6.flowi6_oif = oif; | 1178 | fl6.flowi6_oif = oif; |
1179 | fl6.flowi6_mark = mark; | 1179 | fl6.flowi6_mark = mark ? mark : IP6_REPLY_MARK(net, skb->mark); |
1180 | fl6.daddr = iph->daddr; | 1180 | fl6.daddr = iph->daddr; |
1181 | fl6.saddr = iph->saddr; | 1181 | fl6.saddr = iph->saddr; |
1182 | fl6.flowlabel = ip6_flowinfo(iph); | 1182 | fl6.flowlabel = ip6_flowinfo(iph); |
@@ -1455,7 +1455,7 @@ static int ip6_dst_gc(struct dst_ops *ops) | |||
1455 | goto out; | 1455 | goto out; |
1456 | 1456 | ||
1457 | net->ipv6.ip6_rt_gc_expire++; | 1457 | net->ipv6.ip6_rt_gc_expire++; |
1458 | fib6_run_gc(net->ipv6.ip6_rt_gc_expire, net, entries > rt_max_size); | 1458 | fib6_run_gc(net->ipv6.ip6_rt_gc_expire, net, true); |
1459 | entries = dst_entries_get_slow(ops); | 1459 | entries = dst_entries_get_slow(ops); |
1460 | if (entries < ops->gc_thresh) | 1460 | if (entries < ops->gc_thresh) |
1461 | net->ipv6.ip6_rt_gc_expire = rt_gc_timeout>>1; | 1461 | net->ipv6.ip6_rt_gc_expire = rt_gc_timeout>>1; |