hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NFC: Avoid falling back to SYMM when sk is NULL 

In some cases (SNL, DISC, DM) we need to send an LLCP skbs without
having a sock owning it. I frames are an exception here since
they may be requeued to the llcp_sock queue.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2012-10-05 00:37:22 +02:00
parent 97f18414af
commit a6a0915f8c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/nfc/llcp/llcp.c
View File

@ -610,7 +610,10 @@ static void nfc_llcp_tx_work(struct work_struct *work)
if (skb != NULL) { if (skb != NULL) {
sk = skb->sk; sk = skb->sk;
llcp_sock = nfc_llcp_sock(sk); llcp_sock = nfc_llcp_sock(sk);
if (llcp_sock != NULL) {
if (llcp_sock == NULL && nfc_llcp_ptype(skb) == LLCP_PDU_I) {
nfc_llcp_send_symm(local->dev);
} else {
int ret; int ret;
pr_debug("Sending pending skb\n"); pr_debug("Sending pending skb\n");
@ -629,8 +632,6 @@ static void nfc_llcp_tx_work(struct work_struct *work)
skb_queue_tail(&llcp_sock->tx_pending_queue, skb_queue_tail(&llcp_sock->tx_pending_queue,
skb); skb);
} }
} else {
nfc_llcp_send_symm(local->dev);
} }
} else { } else {
nfc_llcp_send_symm(local->dev); nfc_llcp_send_symm(local->dev);