1 files changed, 32 insertions, 12 deletions

diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index 599d96e74114..e6dd8da6b2ad 100644
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -11,15 +11,20 @@
 #include <linux/init.h>
 #include <linux/jiffies.h>
 #include <linux/spinlock.h>
+#include <linux/rtnetlink.h>
 #include <net/ipv6.h>
 #include <asm/atomic.h>
 
-struct inetpeer_addr {
+struct inetpeer_addr_base {
         union {
-                __be32          a4;
-                __be32          a6[4];
+                __be32                  a4;
+                __be32                  a6[4];
         };
-        __u16   family;
+};
+
+struct inetpeer_addr {
+        struct inetpeer_addr_base       addr;
+        __u16                           family;
 };
 
 struct inet_peer {
@@ -33,15 +38,22 @@ struct inet_peer {
         atomic_t                refcnt;
         /*
          * Once inet_peer is queued for deletion (refcnt == -1), following fields
-         * are not available: rid, ip_id_count, tcp_ts, tcp_ts_stamp
-         * We can share memory with rcu_head to keep inet_peer small
+         * are not available: rid, ip_id_count, tcp_ts, tcp_ts_stamp, metrics
+         * We can share memory with rcu_head to help keep inet_peer small.
          */
         union {
                 struct {
-                        atomic_t        rid;            /* Frag reception counter */
-                        atomic_t        ip_id_count;    /* IP ID for the next packet */
-                        __u32           tcp_ts;
-                        __u32           tcp_ts_stamp;
+                        atomic_t                        rid;            /* Frag reception counter */
+                        atomic_t                        ip_id_count;    /* IP ID for the next packet */
+                        __u32                           tcp_ts;
+                        __u32                           tcp_ts_stamp;
+                        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;
                 };
                 struct rcu_head         rcu;
         };
@@ -49,6 +61,13 @@ struct inet_peer {
 
 void                    inet_initpeers(void) __init;
 
+#define INETPEER_METRICS_NEW    (~(u32) 0)
+
+static inline bool inet_metrics_new(const struct inet_peer *p)
+{
+        return p->metrics[RTAX_LOCK-1] == INETPEER_METRICS_NEW;
+}
+
 /* can be called with or without local BH being disabled */
 struct inet_peer        *inet_getpeer(struct inetpeer_addr *daddr, int create);
 
@@ -56,7 +75,7 @@ static inline struct inet_peer *inet_getpeer_v4(__be32 v4daddr, int create)
 {
         struct inetpeer_addr daddr;
 
-        daddr.a4 = v4daddr;
+        daddr.addr.a4 = v4daddr;
         daddr.family = AF_INET;
         return inet_getpeer(&daddr, create);
 }
@@ -65,13 +84,14 @@ static inline struct inet_peer *inet_getpeer_v6(struct in6_addr *v6daddr, int cr
 {
         struct inetpeer_addr daddr;
 
-        ipv6_addr_copy((struct in6_addr *)daddr.a6, v6daddr);
+        ipv6_addr_copy((struct in6_addr *)daddr.addr.a6, v6daddr);
         daddr.family = AF_INET6;
         return inet_getpeer(&daddr, create);
 }
 
 /* can be called from BH context or outside */
 extern void inet_putpeer(struct inet_peer *p);
+extern bool inet_peer_xrlim_allow(struct inet_peer *peer, int timeout);
 
 /*
  * temporary check to make sure we dont access rid, ip_id_count, tcp_ts,