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

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

Bluetooth: Remove unnecessary queue_monitor_skb() function 



Now that there's the general purpose hci_send_to_channel() API it will
do the exact same thing as queue_monitor_skb() when passed the monitor
HCI channel. This patch removes queue_monitor_skb() and replaces any
users of it with calls to hci_send_to_channel().

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

net/bluetooth/hci_sock.c

+2 −30
Original line number Diff line number Diff line
@@ -217,34 +217,6 @@ void hci_send_to_channel(unsigned short channel, struct sk_buff *skb, 
	read_unlock(&hci_sk_list.lock);

}



static void queue_monitor_skb(struct sk_buff *skb)

{

	struct sock *sk;



	BT_DBG("len %d", skb->len);



	read_lock(&hci_sk_list.lock);



	sk_for_each(sk, &hci_sk_list.head) {

		struct sk_buff *nskb;



		if (sk->sk_state != BT_BOUND)

			continue;



		if (hci_pi(sk)->channel != HCI_CHANNEL_MONITOR)

			continue;



		nskb = skb_clone(skb, GFP_ATOMIC);

		if (!nskb)

			continue;



		if (sock_queue_rcv_skb(sk, nskb))

			kfree_skb(nskb);

	}



	read_unlock(&hci_sk_list.lock);

}



/* Send frame to monitor socket */

void hci_send_to_monitor(struct hci_dev *hdev, struct sk_buff *skb)

{
@@ -291,7 +263,7 @@ void hci_send_to_monitor(struct hci_dev *hdev, struct sk_buff *skb) 
	hdr->index = cpu_to_le16(hdev->id);

	hdr->len = cpu_to_le16(skb->len);



	queue_monitor_skb(skb_copy);

	hci_send_to_channel(HCI_CHANNEL_MONITOR, skb_copy, NULL);

	kfree_skb(skb_copy);

}
@@ -398,7 +370,7 @@ void hci_sock_dev_event(struct hci_dev *hdev, int event) 


		skb = create_monitor_event(hdev, event);

		if (skb) {

			queue_monitor_skb(skb);

			hci_send_to_channel(HCI_CHANNEL_MONITOR, skb, NULL);

			kfree_skb(skb);

		}

	}