---

yaml --- r: 315280 b: refs/heads/master c: 1c215d7 h: refs/heads/master v: v3
git-mirror · Jul 9, 2012 · 5c3b702 · 5c3b702
1 parent 236ffd0
commit 5c3b702
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git 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
@@ -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);