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

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

Bluetooth: Rename hci_send_to_control to hci_send_to_channel 



The hci_send_to_control() can be made more general purpose with a small
change of passing the desired HCI channel as a parameter to it. This
allows using it for the monitor channel as well as e.g. 6lowpan in the
future.

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

include/net/bluetooth/hci_core.h

+2 −1
Original line number Diff line number Diff line
@@ -1265,7 +1265,8 @@ void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 opcode); 


/* ----- HCI Sockets ----- */

void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb);

void hci_send_to_control(struct sk_buff *skb, struct sock *skip_sk);

void hci_send_to_channel(unsigned short channel, struct sk_buff *skb,

			 struct sock *skip_sk);

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



void hci_sock_dev_event(struct hci_dev *hdev, int event);

net/bluetooth/hci_sock.c

+5 −4
Original line number Diff line number Diff line
@@ -183,12 +183,13 @@ void hci_send_to_sock(struct hci_dev *hdev, struct sk_buff *skb) 
	kfree_skb(skb_copy);

}



/* Send frame to control socket */

void hci_send_to_control(struct sk_buff *skb, struct sock *skip_sk)

/* Send frame to sockets with specific channel */

void hci_send_to_channel(unsigned short channel, struct sk_buff *skb,

			 struct sock *skip_sk)

{

	struct sock *sk;



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

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



	read_lock(&hci_sk_list.lock);
@@ -202,7 +203,7 @@ void hci_send_to_control(struct sk_buff *skb, struct sock *skip_sk) 
		if (sk->sk_state != BT_BOUND)

			continue;



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

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

			continue;



		nskb = skb_clone(skb, GFP_ATOMIC);

net/bluetooth/mgmt.c

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include <net/bluetooth/bluetooth.h>

#include <net/bluetooth/hci_core.h>

#include <net/bluetooth/hci_sock.h>

#include <net/bluetooth/l2cap.h>

#include <net/bluetooth/mgmt.h>
@@ -242,7 +243,7 @@ static int mgmt_event(u16 event, struct hci_dev *hdev, void *data, u16 data_len, 
	/* Time stamp */

	__net_timestamp(skb);



	hci_send_to_control(skb, skip_sk);

	hci_send_to_channel(HCI_CHANNEL_CONTROL, skb, skip_sk);

	kfree_skb(skb);



	return 0;