[NET]: sock_register interface changes
The sock_register() doesn't change the family, so the protocols can
define it read-only. No caller ever checks return value from
sock_unregister()
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/socket.c b/net/socket.c
index b5a3fcb..4147fe4 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -147,7 +147,7 @@
*/
static DEFINE_SPINLOCK(net_family_lock);
-static const struct net_proto_family *net_families[NPROTO];
+static const struct net_proto_family *net_families[NPROTO] __read_mostly;
/*
* Statistics counters of the socket lists
@@ -2080,7 +2080,7 @@
* socket interface. The value ops->family coresponds to the
* socket system call protocol family.
*/
-int sock_register(struct net_proto_family *ops)
+int sock_register(const struct net_proto_family *ops)
{
int err;
@@ -2116,10 +2116,9 @@
* a module then it needs to provide its own protection in
* the ops->create routine.
*/
-int sock_unregister(int family)
+void sock_unregister(int family)
{
- if (family < 0 || family >= NPROTO)
- return -EINVAL;
+ BUG_ON(family < 0 || family >= NPROTO);
spin_lock(&net_family_lock);
net_families[family] = NULL;
@@ -2128,7 +2127,6 @@
synchronize_rcu();
printk(KERN_INFO "NET: Unregistered protocol family %d\n", family);
- return 0;
}
static int __init sock_init(void)