summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2008-03-22 16:56:51 -0700
committerDavid S. Miller <davem@davemloft.net>2008-03-22 16:56:51 -0700
commitfc8717baa8f52dd8d1b90df9008300ef3ec794ed (patch)
tree149c5e1c8db5bcf2af47caeb732f900bc722875f /include
parent6ba5a3c52da00015e739469e3b00cd6d0d4c5c67 (diff)
downloadop-kernel-dev-fc8717baa8f52dd8d1b90df9008300ef3ec794ed.zip
op-kernel-dev-fc8717baa8f52dd8d1b90df9008300ef3ec794ed.tar.gz
[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>
Diffstat (limited to 'include')
-rw-r--r--include/net/raw.h4
-rw-r--r--include/net/sock.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/include/net/raw.h b/include/net/raw.h
index 1828f81..6c14a65 100644
--- 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 c3175c4..b433b1e 100644
--- 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;
OpenPOWER on IntegriCloud