Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (42 commits)
  [IPV6]: Consolidate the ip6_pol_route_(input|output) pair
  [TCP]: Make snd_cwnd_cnt 32-bit
  [TCP]: Update the /proc/net/tcp documentation
  [NETNS]: Don't panic on creating the namespace's loopback
  [NEIGH]: Ensure that pneigh_lookup is protected with RTNL
  [INET]: kmalloc+memset -> kzalloc in frag_alloc_queue
  [ISDN]: Fix compile with CONFIG_ISDN_X25 disabled.
  [IPV6]: Replace sk_buff ** with sk_buff * in input handlers
  [SELINUX]: Update for netfilter ->hook() arg changes.
  [INET]: Consolidate the xxx_put
  [INET]: Small cleanup for xxx_put after evictor consolidation
  [INET]: Consolidate the xxx_evictor
  [INET]: Consolidate the xxx_frag_destroy
  [INET]: Consolidate xxx_the secret_rebuild
  [INET]: Consolidate the xxx_frag_kill
  [INET]: Collect common frag sysctl variables together
  [INET]: Collect frag queues management objects together
  [INET]: Move common fields from frag_queues in one place.
  [TG3]: Fix performance regression on 5705.
  [ISDN]: Remove local copy of device name to make sure renames work.
  ...

1 files changed, 60 insertions, 0 deletions

diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
new file mode 100644
index 000000000000..911c2cd02941
--- /dev/null
+++ b/include/net/inet_frag.h
@@ -0,0 +1,60 @@
+#ifndef __NET_FRAG_H__
+#define __NET_FRAG_H__
+
+struct inet_frag_queue {
+        struct hlist_node       list;
+        struct list_head        lru_list;   /* lru list member */
+        spinlock_t              lock;
+        atomic_t                refcnt;
+        struct timer_list       timer;      /* when will this queue expire? */
+        struct sk_buff          *fragments; /* list of received fragments */
+        ktime_t                 stamp;
+        int                     len;        /* total length of orig datagram */
+        int                     meat;
+        __u8                    last_in;    /* first/last segment arrived? */
+
+#define COMPLETE                4
+#define FIRST_IN                2
+#define LAST_IN                 1
+};
+
+#define INETFRAGS_HASHSZ                64
+
+struct inet_frags_ctl {
+        int high_thresh;
+        int low_thresh;
+        int timeout;
+        int secret_interval;
+};
+
+struct inet_frags {
+        struct list_head        lru_list;
+        struct hlist_head       hash[INETFRAGS_HASHSZ];
+        rwlock_t                lock;
+        u32                     rnd;
+        int                     nqueues;
+        int                     qsize;
+        atomic_t                mem;
+        struct timer_list       secret_timer;
+        struct inet_frags_ctl   *ctl;
+
+        unsigned int            (*hashfn)(struct inet_frag_queue *);
+        void                    (*destructor)(struct inet_frag_queue *);
+        void                    (*skb_free)(struct sk_buff *);
+};
+
+void inet_frags_init(struct inet_frags *);
+void inet_frags_fini(struct inet_frags *);
+
+void inet_frag_kill(struct inet_frag_queue *q, struct inet_frags *f);
+void inet_frag_destroy(struct inet_frag_queue *q,
+                                struct inet_frags *f, int *work);
+int inet_frag_evictor(struct inet_frags *f);
+
+static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f)
+{
+        if (atomic_dec_and_test(&q->refcnt))
+                inet_frag_destroy(q, f, NULL);
+}
+
+#endif