diff --git a/[refs] b/[refs] index 7816a4c0c4d3..4eeb1571bd75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5018e490c372d5ed0e0ced2f2471140bf5ba9b32 +refs/heads/master: 1c215d79a18a22fc6c2a9ef8658d426bac492b58 diff --git a/trunk/net/nfc/hci/core.c b/trunk/net/nfc/hci/core.c index 1dc6485343b9..1a009d554fd7 100644 --- a/trunk/net/nfc/hci/core.c +++ b/trunk/net/nfc/hci/core.c @@ -735,16 +735,6 @@ void nfc_hci_recv_frame(struct nfc_hci_dev *hdev, struct sk_buff *skb) struct sk_buff *frag_skb; int msg_len; - if (skb == NULL) { - /* TODO ELa: lower layer had permanent failure, need to - * propagate that up - */ - - skb_queue_purge(&hdev->rx_hcp_frags); - - return; - } - packet = (struct hcp_packet *)skb->data; if ((packet->header & ~NFC_HCI_FRAGMENT) == 0) { skb_queue_tail(&hdev->rx_hcp_frags, skb);