[PATCH] ipc: convert /proc/sysvipc/* to generic seq_file interface

[linux-2.6] / include / net / inet_hashtables.h

diff --git a/include/net/inet_hashtables.h b/include/net/inet_hashtables.h
index b5c0d64ea74142c5a4967f14d1ce3ce4c054fc95..646b6ea7fe26f71f703cae6816e2d6a70f092bca 100644 (file)
--- a/include/net/inet_hashtables.h
+++ b/include/net/inet_hashtables.h
@@ -17,7 +17,6 @@
 #include <linux/config.h>
 
 #include <linux/interrupt.h>
-#include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/list.h>
 #include <linux/slab.h>
@@ -26,6 +25,8 @@
 #include <linux/types.h>
 #include <linux/wait.h>
 
+#include <net/inet_connection_sock.h>
+#include <net/route.h>
 #include <net/sock.h>
 #include <net/tcp_states.h>
 
@@ -185,9 +186,9 @@ static inline void __inet_inherit_port(struct inet_hashinfo *table,
        struct inet_bind_bucket *tb;
 
        spin_lock(&head->lock);
-       tb = inet_sk(sk)->bind_hash;
+       tb = inet_csk(sk)->icsk_bind_hash;
        sk_add_bind_node(child, &tb->owners);
-       inet_sk(child)->bind_hash = tb;
+       inet_csk(child)->icsk_bind_hash = tb;
        spin_unlock(&head->lock);
 }
 
@@ -280,6 +281,11 @@ out:
                wake_up(&hashinfo->lhash_wait);
 }
 
+static inline int inet_iif(const struct sk_buff *skb)
+{
+       return ((struct rtable *)skb->dst)->rt_iif;
+}
+
 extern struct sock *__inet_lookup_listener(const struct hlist_head *head,
                                           const u32 daddr,
                                           const unsigned short hnum,