diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-10-18 13:56:17 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-10-18 13:56:17 -0400 |
| commit | b231070a18d833f425179f2b51c5b22fb6374c7c (patch) | |
| tree | dfdc60810e10a1c0b5e70c1c182f47bac0ca3141 /drivers/bluetooth/hci_h4.c | |
| parent | b6b561c31d51db3dec0cb55412a5d7a1a2397521 (diff) | |
| parent | 4b836f393bd8ed111857a6ee1865e44627266ec6 (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'drivers/bluetooth/hci_h4.c')
| -rw-r--r-- | drivers/bluetooth/hci_h4.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c index 8ae9f1ea2bb..7048a583fe5 100644 --- a/drivers/bluetooth/hci_h4.c +++ b/drivers/bluetooth/hci_h4.c @@ -124,30 +124,6 @@ static int h4_enqueue(struct hci_uart *hu, struct sk_buff *skb) return 0; } -static inline int h4_check_data_len(struct h4_struct *h4, int len) -{ - int room = skb_tailroom(h4->rx_skb); - - BT_DBG("len %d room %d", len, room); - - if (!len) { - hci_recv_frame(h4->rx_skb); - } else if (len > room) { - BT_ERR("Data length is too large"); - kfree_skb(h4->rx_skb); - } else { - h4->rx_state = H4_W4_DATA; - h4->rx_count = len; - return len; - } - - h4->rx_state = H4_W4_PACKET_TYPE; - h4->rx_skb = NULL; - h4->rx_count = 0; - - return 0; -} - /* Recv data */ static int h4_recv(struct hci_uart *hu, void *data, int count) { |