Merge branch 'linus' into x86/urgent

[~andy/linux] / include / net / inetpeer.h

diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index f13cc0c2b163f76eeb45cfabc4d5a7591f854635..15e1f8fe4c1f5d7040472028b64206e0c5587689 100644 (file)
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -1,8 +1,6 @@
 /*
  *             INETPEER - A storage for permanent information about peers
  *
- *  Version:   $Id: inetpeer.h,v 1.2 2002/01/12 07:54:56 davem Exp $
- *
  *  Authors:   Andrey V. Savochkin <saw@msu.ru>
  */
 
@@ -17,14 +15,15 @@
 
 struct inet_peer
 {
+       /* group together avl_left,avl_right,v4daddr to speedup lookups */
        struct inet_peer        *avl_left, *avl_right;
-       struct inet_peer        *unused_next, **unused_prevp;
-       __u32                   dtime;          /* the time of last use of not
-                                                * referenced entries */
-       atomic_t                refcnt;
        __be32                  v4daddr;        /* peer's address */
        __u16                   avl_height;
        __u16                   ip_id_count;    /* IP ID for the next packet */
+       struct list_head        unused;
+       __u32                   dtime;          /* the time of last use of not
+                                                * referenced entries */
+       atomic_t                refcnt;
        atomic_t                rid;            /* Frag reception counter */
        __u32                   tcp_ts;
        unsigned long           tcp_ts_stamp;