diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-19 00:30:39 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-19 00:30:39 -0700 |
commit | 407d819cf0fd54c6fc1138a509225696aecafd15 (patch) | |
tree | b653a5c8c09f7c316f5f98947be262e27a4ca33a /net/bluetooth/bnep | |
parent | 7abbcd6a4c8d6179121f2915a761b1133bf1cd99 (diff) | |
parent | b1235d79611e78a07629b4cbe53291c9cffd1834 (diff) | |
download | linux-3.10-407d819cf0fd54c6fc1138a509225696aecafd15.tar.gz linux-3.10-407d819cf0fd54c6fc1138a509225696aecafd15.tar.bz2 linux-3.10-407d819cf0fd54c6fc1138a509225696aecafd15.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/bnep')
-rw-r--r-- | net/bluetooth/bnep/core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c index 1d98a1b80da..021172c0e66 100644 --- 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); |