diff options
author | Alex Elder <elder@ieee.org> | 2009-09-10 14:33:56 -0500 |
---|---|---|
committer | Alex Elder <aelder@sgi.com> | 2009-09-10 14:33:56 -0500 |
commit | a4872d5b6ad69a49975c0268828b5bb2317ea5a0 (patch) | |
tree | f79577c2731753efb621ef62774949c1e0acdaad /net/netrom/af_netrom.c | |
parent | 4734d401d43c6469d568caf223d37aa0fc1bf4dc (diff) | |
parent | 74fca6a42863ffacaf7ba6f1936a9f228950f657 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/netrom/af_netrom.c')
-rw-r--r-- | net/netrom/af_netrom.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index ce51ce012cd..ce1a34b99c2 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -847,6 +847,7 @@ static int nr_getname(struct socket *sock, struct sockaddr *uaddr, sax->fsa_ax25.sax25_family = AF_NETROM; sax->fsa_ax25.sax25_ndigis = 1; sax->fsa_ax25.sax25_call = nr->user_addr; + memset(sax->fsa_digipeater, 0, sizeof(sax->fsa_digipeater)); sax->fsa_digipeater[0] = nr->dest_addr; *uaddr_len = sizeof(struct full_sockaddr_ax25); } else { |