소스 검색

NFC: llcp: Use default MIU if none was specified on connect

If MIUX is not present in CONNECT or CC use default MIU value (128)
instead of one announced durring link setup.

This was affecting Bluetooth handover with Android 4.3+ NCI stack.

Signed-off-by: Szymon Janc <szymon.janc@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Szymon Janc 12 년 전
부모
커밋
11bfb1c4b9
3개의 변경된 파일1개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      net/nfc/llcp_commands.c
  2. 0 1
      net/nfc/llcp_core.c
  3. 0 1
      net/nfc/llcp_sock.c

+ 1 - 1
net/nfc/llcp_commands.c

@@ -675,7 +675,7 @@ int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock,
 
 
 	do {
 	do {
 		remote_miu = sock->remote_miu > LLCP_MAX_MIU ?
 		remote_miu = sock->remote_miu > LLCP_MAX_MIU ?
-				local->remote_miu : sock->remote_miu;
+				LLCP_DEFAULT_MIU : sock->remote_miu;
 
 
 		frag_len = min_t(size_t, remote_miu, remaining_len);
 		frag_len = min_t(size_t, remote_miu, remaining_len);
 
 

+ 0 - 1
net/nfc/llcp_core.c

@@ -943,7 +943,6 @@ static void nfc_llcp_recv_connect(struct nfc_llcp_local *local,
 	new_sock->local = nfc_llcp_local_get(local);
 	new_sock->local = nfc_llcp_local_get(local);
 	new_sock->rw = sock->rw;
 	new_sock->rw = sock->rw;
 	new_sock->miux = sock->miux;
 	new_sock->miux = sock->miux;
-	new_sock->remote_miu = local->remote_miu;
 	new_sock->nfc_protocol = sock->nfc_protocol;
 	new_sock->nfc_protocol = sock->nfc_protocol;
 	new_sock->dsap = ssap;
 	new_sock->dsap = ssap;
 	new_sock->target_idx = local->target_idx;
 	new_sock->target_idx = local->target_idx;

+ 0 - 1
net/nfc/llcp_sock.c

@@ -700,7 +700,6 @@ static int llcp_sock_connect(struct socket *sock, struct sockaddr *_addr,
 
 
 	llcp_sock->dev = dev;
 	llcp_sock->dev = dev;
 	llcp_sock->local = nfc_llcp_local_get(local);
 	llcp_sock->local = nfc_llcp_local_get(local);
-	llcp_sock->remote_miu = llcp_sock->local->remote_miu;
 	llcp_sock->ssap = nfc_llcp_get_local_ssap(local);
 	llcp_sock->ssap = nfc_llcp_get_local_ssap(local);
 	if (llcp_sock->ssap == LLCP_SAP_MAX) {
 	if (llcp_sock->ssap == LLCP_SAP_MAX) {
 		ret = -ENOMEM;
 		ret = -ENOMEM;