aboutsummaryrefslogtreecommitdiffstats
path: root/net/nfc/llcp/sock.c
diff options
context:
space:
mode:
authorThierry Escande <thierry.escande@linux.intel.com>2013-04-02 04:25:15 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2013-04-11 10:28:59 -0400
commitabd18d43302ae0e214d020c842b34e706cc3778e (patch)
tree8f60cefae483e5ef1b006c79d2922dce7dcdda4b /net/nfc/llcp/sock.c
parent66cbfa10f3bdbc86222598ac700c352da90e588f (diff)
NFC: llcp: Reset RW, LTO, and MIU remote parameters when link goes down
This resets remote parameters in both local and socket llcp structures when the link goes down. That way, nfc_llcp_getsockopt won't return values corresponding to the previous link parameters. Signed-off-by: Thierry Escande <thierry.escande@linux.intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/llcp/sock.c')
-rw-r--r--net/nfc/llcp/sock.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c
index dc94e397d22a..641c535be3d4 100644
--- a/net/nfc/llcp/sock.c
+++ b/net/nfc/llcp/sock.c
@@ -933,12 +933,11 @@ struct sock *nfc_llcp_sock_alloc(struct socket *sock, int type, gfp_t gfp)
933 llcp_sock->dsap = LLCP_SAP_SDP; 933 llcp_sock->dsap = LLCP_SAP_SDP;
934 llcp_sock->rw = LLCP_MAX_RW + 1; 934 llcp_sock->rw = LLCP_MAX_RW + 1;
935 llcp_sock->miux = cpu_to_be16(LLCP_MAX_MIUX + 1); 935 llcp_sock->miux = cpu_to_be16(LLCP_MAX_MIUX + 1);
936 llcp_sock->remote_rw = LLCP_DEFAULT_RW;
937 llcp_sock->remote_miu = LLCP_MAX_MIU + 1;
938 llcp_sock->send_n = llcp_sock->send_ack_n = 0; 936 llcp_sock->send_n = llcp_sock->send_ack_n = 0;
939 llcp_sock->recv_n = llcp_sock->recv_ack_n = 0; 937 llcp_sock->recv_n = llcp_sock->recv_ack_n = 0;
940 llcp_sock->remote_ready = 1; 938 llcp_sock->remote_ready = 1;
941 llcp_sock->reserved_ssap = LLCP_SAP_MAX; 939 llcp_sock->reserved_ssap = LLCP_SAP_MAX;
940 nfc_llcp_socket_remote_param_init(llcp_sock);
942 skb_queue_head_init(&llcp_sock->tx_queue); 941 skb_queue_head_init(&llcp_sock->tx_queue);
943 skb_queue_head_init(&llcp_sock->tx_pending_queue); 942 skb_queue_head_init(&llcp_sock->tx_pending_queue);
944 INIT_LIST_HEAD(&llcp_sock->accept_queue); 943 INIT_LIST_HEAD(&llcp_sock->accept_queue);