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

Commit 0d48d939 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by David S. Miller
Browse files

[Bluetooth]: Move packet type into the SKB control buffer 



This patch moves the usage of packet type into the SKB control
buffer. After this patch it is now possible to shrink the sk_buff
structure and redefine its pkt_type.

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2eb25a6c

drivers/bluetooth/bfusb.c

+4 −4
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static inline int bfusb_recv_block(struct bfusb *bfusb, int hdr, unsigned char * 
		}



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

		skb->pkt_type = pkt_type;

		bt_cb(skb)->pkt_type = pkt_type;



		bfusb->reassembly = skb;

	} else {
@@ -485,7 +485,7 @@ static int bfusb_send_frame(struct sk_buff *skb) 
	unsigned char buf[3];

	int sent = 0, size, count;



	BT_DBG("hdev %p skb %p type %d len %d", hdev, skb, skb->pkt_type, skb->len);

	BT_DBG("hdev %p skb %p type %d len %d", hdev, skb, bt_cb(skb)->pkt_type, skb->len);



	if (!hdev) {

		BT_ERR("Frame for unknown HCI device (hdev=NULL)");
@@ -497,7 +497,7 @@ static int bfusb_send_frame(struct sk_buff *skb) 


	bfusb = (struct bfusb *) hdev->driver_data;



	switch (skb->pkt_type) {

	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:

		hdev->stat.cmd_tx++;

		break;
@@ -510,7 +510,7 @@ static int bfusb_send_frame(struct sk_buff *skb) 
	};



	/* Prepend skb with frame type */

	memcpy(skb_push(skb, 1), &(skb->pkt_type), 1);

	memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);



	count = skb->len;

drivers/bluetooth/bluecard_cs.c

+12 −12
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ static void bluecard_write_wakeup(bluecard_info_t *info) 
		if (!(skb = skb_dequeue(&(info->txq))))

			break;



		if (skb->pkt_type & 0x80) {

		if (bt_cb(skb)->pkt_type & 0x80) {

			/* Disable RTS */

			info->ctrl_reg |= REG_CONTROL_RTS;

			outb(info->ctrl_reg, iobase + REG_CONTROL);
@@ -288,13 +288,13 @@ static void bluecard_write_wakeup(bluecard_info_t *info) 
		/* Mark the buffer as dirty */

		clear_bit(ready_bit, &(info->tx_state));



		if (skb->pkt_type & 0x80) {

		if (bt_cb(skb)->pkt_type & 0x80) {

			DECLARE_WAIT_QUEUE_HEAD(wq);

			DEFINE_WAIT(wait);



			unsigned char baud_reg;



			switch (skb->pkt_type) {

			switch (bt_cb(skb)->pkt_type) {

			case PKT_BAUD_RATE_460800:

				baud_reg = REG_CONTROL_BAUD_RATE_460800;

				break;
@@ -410,9 +410,9 @@ 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;

			info->rx_skb->pkt_type = buf[i];

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



			switch (info->rx_skb->pkt_type) {

			switch (bt_cb(info->rx_skb)->pkt_type) {



			case 0x00:

				/* init packet */
@@ -444,7 +444,7 @@ static void bluecard_receive(bluecard_info_t *info, unsigned int offset) 


			default:

				/* unknown packet */

				BT_ERR("Unknown HCI packet with type 0x%02x received", info->rx_skb->pkt_type);

				BT_ERR("Unknown HCI packet with type 0x%02x received", bt_cb(info->rx_skb)->pkt_type);

				info->hdev->stat.err_rx++;



				kfree_skb(info->rx_skb);
@@ -586,21 +586,21 @@ static int bluecard_hci_set_baud_rate(struct hci_dev *hdev, int baud) 
	switch (baud) {

	case 460800:

		cmd[4] = 0x00;

		skb->pkt_type = PKT_BAUD_RATE_460800;

		bt_cb(skb)->pkt_type = PKT_BAUD_RATE_460800;

		break;

	case 230400:

		cmd[4] = 0x01;

		skb->pkt_type = PKT_BAUD_RATE_230400;

		bt_cb(skb)->pkt_type = PKT_BAUD_RATE_230400;

		break;

	case 115200:

		cmd[4] = 0x02;

		skb->pkt_type = PKT_BAUD_RATE_115200;

		bt_cb(skb)->pkt_type = PKT_BAUD_RATE_115200;

		break;

	case 57600:

		/* Fall through... */

	default:

		cmd[4] = 0x03;

		skb->pkt_type = PKT_BAUD_RATE_57600;

		bt_cb(skb)->pkt_type = PKT_BAUD_RATE_57600;

		break;

	}
@@ -680,7 +680,7 @@ static int bluecard_hci_send_frame(struct sk_buff *skb) 


	info = (bluecard_info_t *)(hdev->driver_data);



	switch (skb->pkt_type) {

	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:

		hdev->stat.cmd_tx++;

		break;
@@ -693,7 +693,7 @@ static int bluecard_hci_send_frame(struct sk_buff *skb) 
	};



	/* Prepend skb with frame type */

	memcpy(skb_push(skb, 1), &(skb->pkt_type), 1);

	memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);

	skb_queue_tail(&(info->txq), skb);



	bluecard_write_wakeup(info);

drivers/bluetooth/bpa10x.c

+7 −7
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static void bpa10x_recv_bulk(struct bpa10x_data *data, unsigned char *buf, int c 
			if (skb) {

				memcpy(skb_put(skb, len), buf, len);

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

				skb->pkt_type = HCI_ACLDATA_PKT;

				bt_cb(skb)->pkt_type = HCI_ACLDATA_PKT;

				hci_recv_frame(skb);

			}

			break;
@@ -117,7 +117,7 @@ static void bpa10x_recv_bulk(struct bpa10x_data *data, unsigned char *buf, int c 
			if (skb) {

				memcpy(skb_put(skb, len), buf, len);

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

				skb->pkt_type = HCI_SCODATA_PKT;

				bt_cb(skb)->pkt_type = HCI_SCODATA_PKT;

				hci_recv_frame(skb);

			}

			break;
@@ -129,7 +129,7 @@ static void bpa10x_recv_bulk(struct bpa10x_data *data, unsigned char *buf, int c 
			if (skb) {

				memcpy(skb_put(skb, len), buf, len);

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

				skb->pkt_type = HCI_VENDOR_PKT;

				bt_cb(skb)->pkt_type = HCI_VENDOR_PKT;

				hci_recv_frame(skb);

			}

			break;
@@ -190,7 +190,7 @@ static int bpa10x_recv_event(struct bpa10x_data *data, unsigned char *buf, int s 
		}



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

		skb->pkt_type = pkt_type;

		bt_cb(skb)->pkt_type = pkt_type;



		memcpy(skb_put(skb, size), buf, size);
@@ -488,7 +488,7 @@ static int bpa10x_send_frame(struct sk_buff *skb) 
	struct hci_dev *hdev = (struct hci_dev *) skb->dev;

	struct bpa10x_data *data;



	BT_DBG("hdev %p skb %p type %d len %d", hdev, skb, skb->pkt_type, skb->len);

	BT_DBG("hdev %p skb %p type %d len %d", hdev, skb, bt_cb(skb)->pkt_type, skb->len);



	if (!hdev) {

		BT_ERR("Frame for unknown HCI device");
@@ -501,9 +501,9 @@ static int bpa10x_send_frame(struct sk_buff *skb) 
	data = hdev->driver_data;



	/* Prepend skb with frame type */

	memcpy(skb_push(skb, 1), &(skb->pkt_type), 1);

	memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);



	switch (skb->pkt_type) {

	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:

		hdev->stat.cmd_tx++;

		skb_queue_tail(&data->cmd_queue, skb);

drivers/bluetooth/bt3c_cs.c

+6 −6
Original line number Diff line number Diff line
@@ -259,11 +259,11 @@ static void bt3c_receive(bt3c_info_t *info) 
		if (info->rx_state == RECV_WAIT_PACKET_TYPE) {



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

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

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

			inb(iobase + DATA_H);

			//printk("bt3c: PACKET_TYPE=%02x\n", info->rx_skb->pkt_type);

			//printk("bt3c: PACKET_TYPE=%02x\n", bt_cb(info->rx_skb)->pkt_type);



			switch (info->rx_skb->pkt_type) {

			switch (bt_cb(info->rx_skb)->pkt_type) {



			case HCI_EVENT_PKT:

				info->rx_state = RECV_WAIT_EVENT_HEADER;
@@ -282,7 +282,7 @@ static void bt3c_receive(bt3c_info_t *info) 


			default:

				/* Unknown packet */

				BT_ERR("Unknown HCI packet with type 0x%02x received", info->rx_skb->pkt_type);

				BT_ERR("Unknown HCI packet with type 0x%02x received", bt_cb(info->rx_skb)->pkt_type);

				info->hdev->stat.err_rx++;

				clear_bit(HCI_RUNNING, &(info->hdev->flags));
@@ -439,7 +439,7 @@ static int bt3c_hci_send_frame(struct sk_buff *skb) 


	info = (bt3c_info_t *) (hdev->driver_data);



	switch (skb->pkt_type) {

	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:

		hdev->stat.cmd_tx++;

		break;
@@ -452,7 +452,7 @@ static int bt3c_hci_send_frame(struct sk_buff *skb) 
	};



	/* Prepend skb with frame type */

	memcpy(skb_push(skb, 1), &(skb->pkt_type), 1);

	memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);

	skb_queue_tail(&(info->txq), skb);



	spin_lock_irqsave(&(info->lock), flags);

drivers/bluetooth/btuart_cs.c

+5 −5
Original line number Diff line number Diff line
@@ -211,9 +211,9 @@ static void btuart_receive(btuart_info_t *info) 
		if (info->rx_state == RECV_WAIT_PACKET_TYPE) {



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

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

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



			switch (info->rx_skb->pkt_type) {

			switch (bt_cb(info->rx_skb)->pkt_type) {



			case HCI_EVENT_PKT:

				info->rx_state = RECV_WAIT_EVENT_HEADER;
@@ -232,7 +232,7 @@ static void btuart_receive(btuart_info_t *info) 


			default:

				/* Unknown packet */

				BT_ERR("Unknown HCI packet with type 0x%02x received", info->rx_skb->pkt_type);

				BT_ERR("Unknown HCI packet with type 0x%02x received", bt_cb(info->rx_skb)->pkt_type);

				info->hdev->stat.err_rx++;

				clear_bit(HCI_RUNNING, &(info->hdev->flags));
@@ -447,7 +447,7 @@ static int btuart_hci_send_frame(struct sk_buff *skb) 


	info = (btuart_info_t *)(hdev->driver_data);



	switch (skb->pkt_type) {

	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:

		hdev->stat.cmd_tx++;

		break;
@@ -460,7 +460,7 @@ static int btuart_hci_send_frame(struct sk_buff *skb) 
	};



	/* Prepend skb with frame type */

	memcpy(skb_push(skb, 1), &(skb->pkt_type), 1);

	memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1);

	skb_queue_tail(&(info->txq), skb);



	btuart_write_wakeup(info);