Commit 5943634f authored by David S. Miller's avatar David S. Miller

ipv4: Maintain redirect and PMTU info in struct rtable again.

Maintaining this in the inetpeer entries was not the right way to do
this at all.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 87a50699
...@@ -36,10 +36,6 @@ struct inet_peer { ...@@ -36,10 +36,6 @@ struct inet_peer {
u32 metrics[RTAX_MAX]; u32 metrics[RTAX_MAX];
u32 rate_tokens; /* rate limiting for ICMP */ u32 rate_tokens; /* rate limiting for ICMP */
unsigned long rate_last; unsigned long rate_last;
unsigned long pmtu_expires;
u32 pmtu_orig;
u32 pmtu_learned;
struct inetpeer_addr_base redirect_learned;
union { union {
struct list_head gc_list; struct list_head gc_list;
struct rcu_head gc_rcu; struct rcu_head gc_rcu;
......
...@@ -65,7 +65,7 @@ struct rtable { ...@@ -65,7 +65,7 @@ struct rtable {
__be32 rt_gateway; __be32 rt_gateway;
/* Miscellaneous cached information */ /* Miscellaneous cached information */
u32 rt_peer_genid; u32 rt_pmtu;
unsigned long _peer; /* long-living peer info */ unsigned long _peer; /* long-living peer info */
struct fib_info *fi; /* for client ref to shared metrics */ struct fib_info *fi; /* for client ref to shared metrics */
}; };
......
...@@ -511,9 +511,6 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base, ...@@ -511,9 +511,6 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base,
p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW; p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
p->rate_tokens = 0; p->rate_tokens = 0;
p->rate_last = 0; p->rate_last = 0;
p->pmtu_expires = 0;
p->pmtu_orig = 0;
memset(&p->redirect_learned, 0, sizeof(p->redirect_learned));
INIT_LIST_HEAD(&p->gc_list); INIT_LIST_HEAD(&p->gc_list);
/* Link the node. */ /* Link the node. */
......
This diff is collapsed.
...@@ -100,6 +100,7 @@ static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev, ...@@ -100,6 +100,7 @@ static int xfrm4_fill_dst(struct xfrm_dst *xdst, struct net_device *dev,
xdst->u.rt.rt_src = rt->rt_src; xdst->u.rt.rt_src = rt->rt_src;
xdst->u.rt.rt_dst = rt->rt_dst; xdst->u.rt.rt_dst = rt->rt_dst;
xdst->u.rt.rt_gateway = rt->rt_gateway; xdst->u.rt.rt_gateway = rt->rt_gateway;
xdst->u.rt.rt_pmtu = rt->rt_pmtu;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment