From 021cf1004a8810715e9d8dfdb97bdf08ffd9016d Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Thu, 21 Jun 2012 17:41:42 +0200 Subject: [PATCH] --- yaml --- r: 315295 b: refs/heads/master c: 12e5bdfefa45ecacd22c519875d06113f95a26af h: refs/heads/master i: 315293: 4ff68327d5a2ab10277f781fb17fd358801d894c 315291: 5862ccede2f986c425837bd4cb2e299ef1561be9 315287: 2251b1f904d67af1b9e7b5b7cf8d85b01f5bcfbe 315279: 236ffd0d33ff15203407924ec996995282dd08e8 315263: cc1e2e34ca247c8c6134bf312244e177fa4477bb v: v3 --- [refs] | 2 +- trunk/net/nfc/llcp/sock.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 85a688f8b3ba..981833f32668 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 025f152046c8a4101a61943ab2065fdf1fa02c0e +refs/heads/master: 12e5bdfefa45ecacd22c519875d06113f95a26af diff --git a/trunk/net/nfc/llcp/sock.c b/trunk/net/nfc/llcp/sock.c index 05ca5a680071..b08e99d2c715 100644 --- a/trunk/net/nfc/llcp/sock.c +++ b/trunk/net/nfc/llcp/sock.c @@ -283,22 +283,25 @@ static int llcp_sock_accept(struct socket *sock, struct socket *newsock, return ret; } -static int llcp_sock_getname(struct socket *sock, struct sockaddr *addr, +static int llcp_sock_getname(struct socket *sock, struct sockaddr *uaddr, int *len, int peer) { - struct sockaddr_nfc_llcp *llcp_addr = (struct sockaddr_nfc_llcp *)addr; struct sock *sk = sock->sk; struct nfc_llcp_sock *llcp_sock = nfc_llcp_sock(sk); + DECLARE_SOCKADDR(struct sockaddr_nfc_llcp *, llcp_addr, uaddr); - pr_debug("%p\n", sk); + pr_debug("%p %d %d %d\n", sk, llcp_sock->target_idx, + llcp_sock->dsap, llcp_sock->ssap); if (llcp_sock == NULL || llcp_sock->dev == NULL) return -EBADFD; - addr->sa_family = AF_NFC; + uaddr->sa_family = AF_NFC; + *len = sizeof(struct sockaddr_nfc_llcp); llcp_addr->dev_idx = llcp_sock->dev->idx; + llcp_addr->target_idx = llcp_sock->target_idx; llcp_addr->dsap = llcp_sock->dsap; llcp_addr->ssap = llcp_sock->ssap; llcp_addr->service_name_len = llcp_sock->service_name_len;