diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-07-23 18:43:48 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-07-23 18:43:48 +0900 |
commit | a3beddd0aa267986de7b13b6d9cd0e1869fcf1fc (patch) | |
tree | bfdc42183f5aac21f605a30a4a511298ab91e3c5 /net/can/raw.c | |
parent | 955c9863bb5855a994751843e7066017edc00410 (diff) | |
parent | 5bdef865eb358b6f3760e25e591ae115e9eeddef (diff) | |
download | kernel-crypto-a3beddd0aa267986de7b13b6d9cd0e1869fcf1fc.tar.gz kernel-crypto-a3beddd0aa267986de7b13b6d9cd0e1869fcf1fc.tar.xz kernel-crypto-a3beddd0aa267986de7b13b6d9cd0e1869fcf1fc.zip |
Merge branch 'sh/kfr2r09'
Diffstat (limited to 'net/can/raw.c')
-rw-r--r-- | net/can/raw.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/can/raw.c b/net/can/raw.c index 6aa154e806a..f4cc44548bd 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -62,6 +62,7 @@ static __initdata const char banner[] = MODULE_DESCRIPTION("PF_CAN raw protocol"); MODULE_LICENSE("Dual BSD/GPL"); MODULE_AUTHOR("Urs Thuermann <urs.thuermann@volkswagen.de>"); +MODULE_ALIAS("can-proto-1"); #define MASK_ALL 0 @@ -306,6 +307,9 @@ static int raw_release(struct socket *sock) ro->bound = 0; ro->count = 0; + sock_orphan(sk); + sock->sk = NULL; + release_sock(sk); sock_put(sk); |