aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2005-03-30 19:27:34 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-03-30 19:27:34 -0800
commit3a0798d0167d59768151953e3eb774b4303e7ddd (patch)
tree124bec8256d24890d64d7060befb45b6d6756e5b
parentf937b476f5353acc37be22a2f59c7b0f2fc77c8e (diff)
downloadhistory-3a0798d0167d59768151953e3eb774b4303e7ddd.tar.gz
[PATCH] Fix incorrect bluetooth socket zapping
On Tue, 2005-03-15 at 22:50 +0000, Linux Kernel Mailing List wrote: > - parent->sk_zapped = 1; > + sock_set_flag(sk, SOCK_ZAPPED); Er, no. That zapped the wrong socket. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--net/bluetooth/sco.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index d1361367d74955..4f19f58c9fc04f 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -349,7 +349,7 @@ static void sco_sock_cleanup_listen(struct sock *parent)
}
parent->sk_state = BT_CLOSED;
- sock_set_flag(sk, SOCK_ZAPPED);
+ sock_set_flag(parent, SOCK_ZAPPED);
}
/* Kill socket (only if zapped and orphan)