diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-25 22:39:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-25 22:39:45 -0800 |
| commit | c01debcd72ff37dbd87de54d5f0a1d753092775f (patch) | |
| tree | a14e17c2e368eaae70ce21d0d3c88d419b1183d4 /net/bluetooth/rfcomm/sock.c | |
| parent | d506d2b66af72403912db434453c5e5a31c0b2d3 (diff) | |
| parent | 651b6a34392167cd0310869cbc0341f91ba4d956 (diff) | |
Merge bk://kernel.bkbits.net/davem/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'net/bluetooth/rfcomm/sock.c')
| -rw-r--r-- | net/bluetooth/rfcomm/sock.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 0d823f59c440..097e007cd9b0 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -196,9 +196,6 @@ static void rfcomm_sock_destruct(struct sock *sk) rfcomm_dlc_unlock(d); rfcomm_dlc_put(d); - - if (sk->sk_protinfo) - kfree(sk->sk_protinfo); } static void rfcomm_sock_cleanup_listen(struct sock *parent) @@ -838,7 +835,7 @@ int rfcomm_connect_ind(struct rfcomm_session *s, u8 channel, struct rfcomm_dlc * return 0; /* Check for backlog size */ - if (parent->sk_ack_backlog > parent->sk_max_ack_backlog) { + if (sk_acceptq_is_full(parent)) { BT_DBG("backlog full %d", parent->sk_ack_backlog); goto done; } |