Merge branch 'upstream-merged'

1 files changed, 53 insertions, 0 deletions

diff --git a/libdde-linux26/contrib/include/net/inetpeer.h b/libdde-linux26/contrib/include/net/inetpeer.h
new file mode 100644
index 00000000..15e1f8fe
--- /dev/null
+++ b/libdde-linux26/contrib/include/net/inetpeer.h
@@ -0,0 +1,53 @@
+/*
+ *		INETPEER - A storage for permanent information about peers
+ *
+ *  Authors:	Andrey V. Savochkin <saw@msu.ru>
+ */
+
+#ifndef _NET_INETPEER_H
+#define _NET_INETPEER_H
+
+#include <linux/types.h>
+#include <linux/init.h>
+#include <linux/jiffies.h>
+#include <linux/spinlock.h>
+#include <asm/atomic.h>
+
+struct inet_peer
+{
+	/* group together avl_left,avl_right,v4daddr to speedup lookups */
+	struct inet_peer	*avl_left, *avl_right;
+	__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;
+};
+
+void			inet_initpeers(void) __init;
+
+/* can be called with or without local BH being disabled */
+struct inet_peer	*inet_getpeer(__be32 daddr, int create);
+
+/* can be called from BH context or outside */
+extern void inet_putpeer(struct inet_peer *p);
+
+extern spinlock_t inet_peer_idlock;
+/* can be called with or without local BH being disabled */
+static inline __u16	inet_getid(struct inet_peer *p, int more)
+{
+	__u16 id;
+
+	spin_lock_bh(&inet_peer_idlock);
+	id = p->ip_id_count;
+	p->ip_id_count += 1 + more;
+	spin_unlock_bh(&inet_peer_idlock);
+	return id;
+}
+
+#endif /* _NET_INETPEER_H */