[RAW]: Add raw_hashinfo member on struct proto.

Sorry for the patch sequence confusion :| but I found that the similar
thing can be done for raw sockets easily too late.

Expand the proto.h union with the raw_hashinfo member and use it in
raw_prot and rawv6_prot. This allows to drop the protocol specific
versions of hash and unhash callbacks.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/raw.h b/include/net/raw.h
index 1828f81fe37474ca6a3228188133d1b86d817a37..6c14a656357a8449dc79269ce992ee16fe6c6d89 100644 (file)
--- a/include/net/raw.h
+++ b/include/net/raw.h
@@ -53,7 +53,7 @@ int raw_seq_open(struct inode *ino, struct file *file,
 
 #endif
 
-void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h);
-void raw_unhash_sk(struct sock *sk, struct raw_hashinfo *h);
+void raw_hash_sk(struct sock *sk);
+void raw_unhash_sk(struct sock *sk);
 
 #endif /* _RAW_H */

diff --git a/include/net/sock.h b/include/net/sock.h
index c3175c400b79ce3b6f064647bcbc2feacf376b8d..b433b1ed203dae905d5b6284625775ce1a6c7405 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -504,6 +504,7 @@ extern int sk_wait_data(struct sock *sk, long *timeo);
 struct request_sock_ops;
 struct timewait_sock_ops;
 struct inet_hashinfo;
+struct raw_hashinfo;
 
 /* Networking protocol blocks we attach to sockets.
  * socket layer -> transport layer interface
@@ -589,6 +590,7 @@ struct proto {
        union {
                struct inet_hashinfo    *hashinfo;
                struct hlist_head       *udp_hash;
+               struct raw_hashinfo     *raw_hash;
        } h;
 
        struct module           *owner;

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index e10ef6c2202aac82f868e72b15e828a28afdaca3..b433b485a88331bc334c5affeef5de1ac51055e6 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -84,8 +84,9 @@ static struct raw_hashinfo raw_v4_hashinfo = {
        .lock = __RW_LOCK_UNLOCKED(raw_v4_hashinfo.lock),
 };
 
-void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h)
+void raw_hash_sk(struct sock *sk)
 {
+       struct raw_hashinfo *h = sk->sk_prot->h.raw_hash;
        struct hlist_head *head;
 
        head = &h->ht[inet_sk(sk)->num & (RAW_HTABLE_SIZE - 1)];
@@ -97,8 +98,10 @@ void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h)
 }
 EXPORT_SYMBOL_GPL(raw_hash_sk);
 
-void raw_unhash_sk(struct sock *sk, struct raw_hashinfo *h)
+void raw_unhash_sk(struct sock *sk)
 {
+       struct raw_hashinfo *h = sk->sk_prot->h.raw_hash;
+
        write_lock_bh(&h->lock);
        if (sk_del_node_init(sk))
                sock_prot_inuse_add(sk->sk_prot, -1);
@@ -106,16 +109,6 @@ void raw_unhash_sk(struct sock *sk, struct raw_hashinfo *h)
 }
 EXPORT_SYMBOL_GPL(raw_unhash_sk);
 
-static void raw_v4_hash(struct sock *sk)
-{
-       raw_hash_sk(sk, &raw_v4_hashinfo);
-}
-
-static void raw_v4_unhash(struct sock *sk)
-{
-       raw_unhash_sk(sk, &raw_v4_hashinfo);
-}
-
 static struct sock *__raw_v4_lookup(struct net *net, struct sock *sk,
                unsigned short num, __be32 raddr, __be32 laddr, int dif)
 {
@@ -841,9 +834,10 @@ struct proto raw_prot = {
        .recvmsg           = raw_recvmsg,
        .bind              = raw_bind,
        .backlog_rcv       = raw_rcv_skb,
-       .hash              = raw_v4_hash,
-       .unhash            = raw_v4_unhash,
+       .hash              = raw_hash_sk,
+       .unhash            = raw_unhash_sk,
        .obj_size          = sizeof(struct raw_sock),
+       .h.raw_hash        = &raw_v4_hashinfo,
 #ifdef CONFIG_COMPAT
        .compat_setsockopt = compat_raw_setsockopt,
        .compat_getsockopt = compat_raw_getsockopt,

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index d6afa02167599e6b997e219c45603cf6f8cd860c..a9e4235157a2039df8d6a8cde866280e155ce092 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -65,17 +65,6 @@ static struct raw_hashinfo raw_v6_hashinfo = {
        .lock = __RW_LOCK_UNLOCKED(raw_v6_hashinfo.lock),
 };
 
-static void raw_v6_hash(struct sock *sk)
-{
-       raw_hash_sk(sk, &raw_v6_hashinfo);
-}
-
-static void raw_v6_unhash(struct sock *sk)
-{
-       raw_unhash_sk(sk, &raw_v6_hashinfo);
-}
-
-
 static struct sock *__raw_v6_lookup(struct net *net, struct sock *sk,
                unsigned short num, struct in6_addr *loc_addr,
                struct in6_addr *rmt_addr, int dif)
@@ -1201,9 +1190,10 @@ struct proto rawv6_prot = {
        .recvmsg           = rawv6_recvmsg,
        .bind              = rawv6_bind,
        .backlog_rcv       = rawv6_rcv_skb,
-       .hash              = raw_v6_hash,
-       .unhash            = raw_v6_unhash,
+       .hash              = raw_hash_sk,
+       .unhash            = raw_unhash_sk,
        .obj_size          = sizeof(struct raw6_sock),
+       .h.raw_hash        = &raw_v6_hashinfo,
 #ifdef CONFIG_COMPAT
        .compat_setsockopt = compat_rawv6_setsockopt,
        .compat_getsockopt = compat_rawv6_getsockopt,