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>

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 {
         u32                     metrics[RTAX_MAX];
         u32                     rate_tokens;    /* rate limiting for ICMP */
         unsigned long           rate_last;
-        unsigned long           pmtu_expires;
-        u32                     pmtu_orig;
-        u32                     pmtu_learned;
-        struct inetpeer_addr_base redirect_learned;
         union {
                 struct list_head        gc_list;
                 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 {
         __be32                  rt_gateway;
 
         /* Miscellaneous cached information */
-        u32                     rt_peer_genid;
+        u32                     rt_pmtu;
         unsigned long           _peer; /* long-living peer info */
         struct fib_info         *fi; /* for client ref to shared metrics */
 };