Merge tag 'mmc-v4.3' of git://git.linaro.org/people/ulf.hansson/mmc

[cascardo/linux.git] / include / net / inetpeer.h

diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index 002f0bd..4a6009d 100644 (file)
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -15,16 +15,20 @@
 #include <net/ipv6.h>
 #include <linux/atomic.h>
 
-struct inetpeer_addr_base {
-       union {
-               __be32                  a4;
-               __be32                  a6[4];
-               struct in6_addr         in6;
-       };
+/* IPv4 address key for cache lookups */
+struct ipv4_addr_key {
+       __be32  addr;
+       int     vif;
 };
 
+#define INETPEER_MAXKEYSZ   (sizeof(struct in6_addr) / sizeof(u32))
+
 struct inetpeer_addr {
-       struct inetpeer_addr_base       addr;
+       union {
+               struct ipv4_addr_key    a4;
+               struct in6_addr         a6;
+               u32                     key[INETPEER_MAXKEYSZ];
+       };
        __u16                           family;
 };
 
@@ -71,6 +75,29 @@ void inet_initpeers(void) __init;
 
 #define INETPEER_METRICS_NEW   (~(u32) 0)
 
+static inline void inetpeer_set_addr_v4(struct inetpeer_addr *iaddr, __be32 ip)
+{
+       iaddr->a4.addr = ip;
+       iaddr->family = AF_INET;
+}
+
+static inline __be32 inetpeer_get_addr_v4(struct inetpeer_addr *iaddr)
+{
+       return iaddr->a4.addr;
+}
+
+static inline void inetpeer_set_addr_v6(struct inetpeer_addr *iaddr,
+                                       struct in6_addr *in6)
+{
+       iaddr->a6 = *in6;
+       iaddr->family = AF_INET6;
+}
+
+static inline struct in6_addr *inetpeer_get_addr_v6(struct inetpeer_addr *iaddr)
+{
+       return &iaddr->a6;
+}
+
 /* can be called with or without local BH being disabled */
 struct inet_peer *inet_getpeer(struct inet_peer_base *base,
                               const struct inetpeer_addr *daddr,
@@ -78,11 +105,12 @@ struct inet_peer *inet_getpeer(struct inet_peer_base *base,
 
 static inline struct inet_peer *inet_getpeer_v4(struct inet_peer_base *base,
                                                __be32 v4daddr,
-                                               int create)
+                                               int vif, int create)
 {
        struct inetpeer_addr daddr;
 
-       daddr.addr.a4 = v4daddr;
+       daddr.a4.addr = v4daddr;
+       daddr.a4.vif = vif;
        daddr.family = AF_INET;
        return inet_getpeer(base, &daddr, create);
 }
@@ -93,11 +121,32 @@ static inline struct inet_peer *inet_getpeer_v6(struct inet_peer_base *base,
 {
        struct inetpeer_addr daddr;
 
-       daddr.addr.in6 = *v6daddr;
+       daddr.a6 = *v6daddr;
        daddr.family = AF_INET6;
        return inet_getpeer(base, &daddr, create);
 }
 
+static inline int inetpeer_addr_cmp(const struct inetpeer_addr *a,
+                                   const struct inetpeer_addr *b)
+{
+       int i, n;
+
+       if (a->family == AF_INET)
+               n = sizeof(a->a4) / sizeof(u32);
+       else
+               n = sizeof(a->a6) / sizeof(u32);
+
+       for (i = 0; i < n; i++) {
+               if (a->key[i] == b->key[i])
+                       continue;
+               if (a->key[i] < b->key[i])
+                       return -1;
+               return 1;
+       }
+
+       return 0;
+}
+
 /* can be called from BH context or outside */
 void inet_putpeer(struct inet_peer *p);
 bool inet_peer_xrlim_allow(struct inet_peer *peer, int timeout);