Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1a26170 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Provide hdev parameter to hci_recv_frame() driver callback 



To avoid casting skb->dev into hdev, just let the drivers provide
the hdev directly when calling hci_recv_frame() function.

This patch also fixes up all drivers to provide the hdev.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 8909f6d2

drivers/bluetooth/bfusb.c

+1 −2
Original line number Diff line number Diff line
@@ -318,7 +318,6 @@ static inline int bfusb_recv_block(struct bfusb_data *data, int hdr, unsigned ch 
			return -ENOMEM;

		}



		skb->dev = (void *) data->hdev;

		bt_cb(skb)->pkt_type = pkt_type;



		data->reassembly = skb;
@@ -333,7 +332,7 @@ static inline int bfusb_recv_block(struct bfusb_data *data, int hdr, unsigned ch 
		memcpy(skb_put(data->reassembly, len), buf, len);



	if (hdr & 0x08) {

		hci_recv_frame(data->reassembly);

		hci_recv_frame(data->hdev, data->reassembly);

		data->reassembly = NULL;

	}

drivers/bluetooth/bluecard_cs.c

+1 −2
Original line number Diff line number Diff line
@@ -399,7 +399,6 @@ static void bluecard_receive(bluecard_info_t *info, unsigned int offset) 


		if (info->rx_state == RECV_WAIT_PACKET_TYPE) {



			info->rx_skb->dev = (void *) info->hdev;

			bt_cb(info->rx_skb)->pkt_type = buf[i];



			switch (bt_cb(info->rx_skb)->pkt_type) {
@@ -477,7 +476,7 @@ static void bluecard_receive(bluecard_info_t *info, unsigned int offset) 
					break;



				case RECV_WAIT_DATA:

					hci_recv_frame(info->rx_skb);

					hci_recv_frame(info->hdev, info->rx_skb);

					info->rx_skb = NULL;

					break;

drivers/bluetooth/bpa10x.c

+1 −3
Original line number Diff line number Diff line
@@ -129,8 +129,6 @@ static int bpa10x_recv(struct hci_dev *hdev, int queue, void *buf, int count) 
				return -ENOMEM;

			}



			skb->dev = (void *) hdev;



			data->rx_skb[queue] = skb;



			scb = (void *) skb->cb;
@@ -155,7 +153,7 @@ static int bpa10x_recv(struct hci_dev *hdev, int queue, void *buf, int count) 
			data->rx_skb[queue] = NULL;



			bt_cb(skb)->pkt_type = scb->type;

			hci_recv_frame(skb);

			hci_recv_frame(hdev, skb);

		}



		count -= len; buf += len;

drivers/bluetooth/bt3c_cs.c

+1 −2
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ static void bt3c_receive(bt3c_info_t *info) 


		if (info->rx_state == RECV_WAIT_PACKET_TYPE) {



			info->rx_skb->dev = (void *) info->hdev;

			bt_cb(info->rx_skb)->pkt_type = inb(iobase + DATA_L);

			inb(iobase + DATA_H);

			//printk("bt3c: PACKET_TYPE=%02x\n", bt_cb(info->rx_skb)->pkt_type);
@@ -318,7 +317,7 @@ static void bt3c_receive(bt3c_info_t *info) 
					break;



				case RECV_WAIT_DATA:

					hci_recv_frame(info->rx_skb);

					hci_recv_frame(info->hdev, info->rx_skb);

					info->rx_skb = NULL;

					break;

drivers/bluetooth/btmrvl_sdio.c

+3 −5
Original line number Diff line number Diff line
@@ -600,15 +600,14 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv) 
	case HCI_SCODATA_PKT:

	case HCI_EVENT_PKT:

		bt_cb(skb)->pkt_type = type;

		skb->dev = (void *)hdev;

		skb_put(skb, buf_len);

		skb_pull(skb, SDIO_HEADER_LEN);



		if (type == HCI_EVENT_PKT) {

			if (btmrvl_check_evtpkt(priv, skb))

				hci_recv_frame(skb);

				hci_recv_frame(hdev, skb);

		} else {

			hci_recv_frame(skb);

			hci_recv_frame(hdev, skb);

		}



		hdev->stat.byte_rx += buf_len;
@@ -616,12 +615,11 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv) 


	case MRVL_VENDOR_PKT:

		bt_cb(skb)->pkt_type = HCI_VENDOR_PKT;

		skb->dev = (void *)hdev;

		skb_put(skb, buf_len);

		skb_pull(skb, SDIO_HEADER_LEN);



		if (btmrvl_process_event(priv, skb))

			hci_recv_frame(skb);

			hci_recv_frame(hdev, skb);



		hdev->stat.byte_rx += buf_len;

		break;