diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-18 17:37:37 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-08-18 17:37:37 -0400 |
| commit | af15c1addf920d830b030e3489a482456904ca8c (patch) | |
| tree | dc4adab63d19507f7ac44855ad9920f8fd2dd2f0 /net/netrom/af_netrom.c | |
| parent | e6f25a7b2398581a5f96bf9021d0b22c9647acf4 (diff) | |
| parent | dcd94dbdaff452b95d4ba11fdbf853b5bda8e6e7 (diff) | |
Merge branch 'master' into for-linus
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 ce51ce012cda..ce1a34b99c23 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, | |||
| 847 | sax->fsa_ax25.sax25_family = AF_NETROM; | 847 | sax->fsa_ax25.sax25_family = AF_NETROM; |
| 848 | sax->fsa_ax25.sax25_ndigis = 1; | 848 | sax->fsa_ax25.sax25_ndigis = 1; |
| 849 | sax->fsa_ax25.sax25_call = nr->user_addr; | 849 | sax->fsa_ax25.sax25_call = nr->user_addr; |
| 850 | memset(sax->fsa_digipeater, 0, sizeof(sax->fsa_digipeater)); | ||
| 850 | sax->fsa_digipeater[0] = nr->dest_addr; | 851 | sax->fsa_digipeater[0] = nr->dest_addr; |
| 851 | *uaddr_len = sizeof(struct full_sockaddr_ax25); | 852 | *uaddr_len = sizeof(struct full_sockaddr_ax25); |
| 852 | } else { | 853 | } else { |