aboutsummaryrefslogtreecommitdiff
path: root/net/bluetooth/bnep/core.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-12-06 15:35:34 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-12-06 15:35:34 -0500
commitf435d9eea01309aa7b6c1f134569a7b5957918ae (patch)
tree2737a48d423a8191671098b15aabd6391af2d23a /net/bluetooth/bnep/core.c
parent5ee493767352314893520ac40aec5bb07d0147e0 (diff)
parent09f921f83faa49cdea25abfb98c439c01526b89d (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'net/bluetooth/bnep/core.c')
-rw-r--r--net/bluetooth/bnep/core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index f10b41fb05a0..5868597534e5 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -648,6 +648,7 @@ int bnep_del_connection(struct bnep_conndel_req *req)
static void __bnep_copy_ci(struct bnep_conninfo *ci, struct bnep_session *s)
{
+ memset(ci, 0, sizeof(*ci));
memcpy(ci->dst, s->eh.h_source, ETH_ALEN);
strcpy(ci->device, s->dev->name);
ci->flags = s->flags;