git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluet...
[sfrench/cifs-2.6.git]
/
net
/
bluetooth
/
bnep
/
core.c
diff --git
a/net/bluetooth/bnep/core.c
b/net/bluetooth/bnep/core.c
index 1d98a1b80da73aa30d04113b636944cb3494f8fb..021172c0e6660e016877ef6ab3a92211ffce94fb 100644
(file)
--- a/
net/bluetooth/bnep/core.c
+++ b/
net/bluetooth/bnep/core.c
@@
-503,6
+503,11
@@
static int bnep_session(void *arg)
/* Delete network device */
unregister_netdev(dev);
+ /* Wakeup user-space polling for socket errors */
+ s->sock->sk->sk_err = EUNATCH;
+
+ wake_up_interruptible(s->sock->sk->sk_sleep);
+
/* Release the socket */
fput(s->sock->file);