Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[karo-tx-linux.git] / drivers / bluetooth / hci_ath.c

diff --git a/drivers/bluetooth/hci_ath.c b/drivers/bluetooth/hci_ath.c
index d776dfd5147811ef37071e68ffd9d9ceaa961c0d..0ccf6bf01ed41eb39afcb16af924dca760d360f3 100644 (file)
--- a/drivers/bluetooth/hci_ath.c
+++ b/drivers/bluetooth/hci_ath.c
@@ -205,7 +205,7 @@ static int ath_enqueue(struct hci_uart *hu, struct sk_buff *skb)
 {
        struct ath_struct *ath = hu->priv;
 
-       if (bt_cb(skb)->pkt_type == HCI_SCODATA_PKT) {
+       if (hci_skb_pkt_type(skb) == HCI_SCODATA_PKT) {
                kfree_skb(skb);
                return 0;
        }
@@ -213,7 +213,7 @@ static int ath_enqueue(struct hci_uart *hu, struct sk_buff *skb)
        /* Update power management enable flag with parameters of
         * HCI sleep enable vendor specific HCI command.
         */
-       if (bt_cb(skb)->pkt_type == HCI_COMMAND_PKT) {
+       if (hci_skb_pkt_type(skb) == HCI_COMMAND_PKT) {
                struct hci_command_hdr *hdr = (void *)skb->data;
 
                if (__le16_to_cpu(hdr->opcode) == HCI_OP_ATH_SLEEP)
@@ -223,7 +223,7 @@ static int ath_enqueue(struct hci_uart *hu, struct sk_buff *skb)
        BT_DBG("hu %p skb %p", hu, skb);
 
        /* Prepend skb with frame type */
-       memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);
+       memcpy(skb_push(skb, 1), &hci_skb_pkt_type(skb), 1);
 
        skb_queue_tail(&ath->txq, skb);
        set_bit(HCI_UART_SENDING, &hu->tx_state);