Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

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

diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c
index 5803aaed958f9518bdf9b6683ae64aa24be0514e..8165ef2fe8777a7e119052e9d1c37848e9c6d885 100644 (file)
--- a/drivers/bluetooth/bt3c_cs.c
+++ b/drivers/bluetooth/bt3c_cs.c
@@ -246,10 +246,10 @@ static void bt3c_receive(struct bt3c_info *info)
 
                if (info->rx_state == RECV_WAIT_PACKET_TYPE) {
 
-                       bt_cb(info->rx_skb)->pkt_type = inb(iobase + DATA_L);
+                       hci_skb_pkt_type(info->rx_skb) = inb(iobase + DATA_L);
                        inb(iobase + DATA_H);
 
-                       switch (bt_cb(info->rx_skb)->pkt_type) {
+                       switch (hci_skb_pkt_type(info->rx_skb)) {
 
                        case HCI_EVENT_PKT:
                                info->rx_state = RECV_WAIT_EVENT_HEADER;
@@ -268,7 +268,8 @@ static void bt3c_receive(struct bt3c_info *info)
 
                        default:
                                /* Unknown packet */
-                               BT_ERR("Unknown HCI packet with type 0x%02x received", bt_cb(info->rx_skb)->pkt_type);
+                               BT_ERR("Unknown HCI packet with type 0x%02x received",
+                                      hci_skb_pkt_type(info->rx_skb));
                                info->hdev->stat.err_rx++;
 
                                kfree_skb(info->rx_skb);
@@ -411,7 +412,7 @@ static int bt3c_hci_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
        struct bt3c_info *info = hci_get_drvdata(hdev);
        unsigned long flags;
 
-       switch (bt_cb(skb)->pkt_type) {
+       switch (hci_skb_pkt_type(skb)) {
        case HCI_COMMAND_PKT:
                hdev->stat.cmd_tx++;
                break;
@@ -424,7 +425,7 @@ static int bt3c_hci_send_frame(struct hci_dev *hdev, struct sk_buff *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(&(info->txq), skb);
 
        spin_lock_irqsave(&(info->lock), flags);