diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-10 09:58:42 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-11 01:40:14 -0400 |
commit | 5943634fc5592037db0693b261f7f4bea6bb9457 (patch) | |
tree | 4fdaf67e5be0df3c3067ff2a7febd28f118f02be /include | |
parent | 87a50699cb6d169591cc776fb82683a2c77cecac (diff) |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/inetpeer.h | 4 | ||||
-rw-r--r-- | include/net/route.h | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h index 1119f6f6cdb4..53f464d7cddc 100644 --- a/include/net/inetpeer.h +++ b/include/net/inetpeer.h | |||
@@ -36,10 +36,6 @@ struct inet_peer { | |||
36 | u32 metrics[RTAX_MAX]; | 36 | u32 metrics[RTAX_MAX]; |
37 | u32 rate_tokens; /* rate limiting for ICMP */ | 37 | u32 rate_tokens; /* rate limiting for ICMP */ |
38 | unsigned long rate_last; | 38 | unsigned long rate_last; |
39 | unsigned long pmtu_expires; | ||
40 | u32 pmtu_orig; | ||
41 | u32 pmtu_learned; | ||
42 | struct inetpeer_addr_base redirect_learned; | ||
43 | union { | 39 | union { |
44 | struct list_head gc_list; | 40 | struct list_head gc_list; |
45 | struct rcu_head gc_rcu; | 41 | struct rcu_head gc_rcu; |
diff --git a/include/net/route.h b/include/net/route.h index 635d7a99d199..c27449466d18 100644 --- a/include/net/route.h +++ b/include/net/route.h | |||
@@ -65,7 +65,7 @@ struct rtable { | |||
65 | __be32 rt_gateway; | 65 | __be32 rt_gateway; |
66 | 66 | ||
67 | /* Miscellaneous cached information */ | 67 | /* Miscellaneous cached information */ |
68 | u32 rt_peer_genid; | 68 | u32 rt_pmtu; |
69 | unsigned long _peer; /* long-living peer info */ | 69 | unsigned long _peer; /* long-living peer info */ |
70 | struct fib_info *fi; /* for client ref to shared metrics */ | 70 | struct fib_info *fi; /* for client ref to shared metrics */ |
71 | }; | 71 | }; |