diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-25 07:35:12 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-25 07:35:12 +0100 |
| commit | 1b0db64fb7693c1a131b7bcc38f7bc63fb396850 (patch) | |
| tree | f393ebcc4496de2424d3f624c3623194e19c8b22 /net/bluetooth/bnep/sock.c | |
| parent | sch_choke: add choke_skb_cb (diff) | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil... (diff) | |
| download | linux-1b0db64fb7693c1a131b7bcc38f7bc63fb396850.tar.xz linux-1b0db64fb7693c1a131b7bcc38f7bc63fb396850.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/bluetooth/bnep/sock.c')
| -rw-r--r-- | net/bluetooth/bnep/sock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c index 2862f53b66b1..d935da71ab3b 100644 --- a/net/bluetooth/bnep/sock.c +++ b/net/bluetooth/bnep/sock.c @@ -88,6 +88,7 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long sockfd_put(nsock); return -EBADFD; } + ca.device[sizeof(ca.device)-1] = 0; err = bnep_add_connection(&ca, nsock); if (!err) { |