The patch titled
sock_register interface changes
has been added to the -mm tree. Its filename is
sock_register-interface-changes.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: sock_register interface changes
From: Stephen Hemminger <shemminger@xxxxxxxx>
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@xxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/linux/net.h | 4 ++--
net/socket.c | 10 ++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff -puN include/linux/net.h~sock_register-interface-changes include/linux/net.h
--- a/include/linux/net.h~sock_register-interface-changes
+++ a/include/linux/net.h
@@ -176,8 +176,8 @@ struct iovec;
struct kvec;
extern int sock_wake_async(struct socket *sk, int how, int band);
-extern int sock_register(struct net_proto_family *fam);
-extern int sock_unregister(int family);
+extern int sock_register(const struct net_proto_family *fam);
+extern void sock_unregister(int family);
extern int sock_create(int family, int type, int proto,
struct socket **res);
extern int sock_create_kern(int family, int type, int proto,
diff -puN net/socket.c~sock_register-interface-changes net/socket.c
--- a/net/socket.c~sock_register-interface-changes
+++ a/net/socket.c
@@ -147,7 +147,7 @@ static struct file_operations socket_fil
*/
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
@@ -2079,7 +2079,7 @@ asmlinkage long sys_socketcall(int call,
* 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;
@@ -2115,10 +2115,9 @@ int sock_register(struct net_proto_famil
* 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;
@@ -2127,7 +2126,6 @@ int sock_unregister(int family)
synchronize_rcu();
printk(KERN_INFO "NET: Unregistered protocol family %d\n", family);
- return 0;
}
static int __init sock_init(void)
_
Patches currently in -mm which might be from shemminger@xxxxxxxx are
git-netdev-all.patch
via-rhine-napi-support.patch
via-rhine-napi-poll-enable.patch
forcedeth-move-mac-address-setup-teardown.patch
forcedeth-mac-address-corrected.patch
forcdeth-revised-napi-support.patch
sock_create-bad-error-return.patch
socket-code-style-cleanup.patch
net-drop-unused-elements-from-net_proto_family.patch
net-socket-family-using-rcu.patch
sock_register-interface-changes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
