Bluetooth: Rename hci_send_to_control to hci_send_to_channel
Subsystems (2)
PATCH v2 1/2 Bluetooth: Rename hci_send_to_control to hci_send_to_channel
From: Johan Hedberg <[email protected]>
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.
--- include/net/bluetooth/hci_core.h | 3 ++- net/bluetooth/hci_sock.c | 9 +++++---- net/bluetooth/mgmt.c | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-)
include/net/bluetooth/hci_core.h +2 -1
@@ -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
@@ -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
@@ -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 ;
Signature · 1 line
2.1.0
PATCH v2 2/2 Bluetooth: Remove unnecessary queue_monitor_skb() function
From: Johan Hedberg <[email protected]>
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().
--- net/bluetooth/hci_sock.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-)
net/bluetooth/hci_sock.c +2 -30
@@ -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); } }
Signature · 1 line
2.1.0
Marcel Holtmann
maintainerRe: [PATCH v2 2/2] Bluetooth: Remove unnecessary queue_monitor_skb() function
Hi Johan,
Quoted 9 lines
Now that there's the general purpose
hci_send_to_channel()API it will do the exact same thing asqueue_monitor_skb()when passed the monitor HCI channel. This patch removesqueue_monitor_skb()and replaces any users of it with calls tohci_send_to_channel().Signed-off-by Johan Hedberg <[email protected]>---
net/bluetooth/hci_sock.c| 32 ++------------------------------1 file changed, 2 insertions(+), 30 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel
Marcel Holtmann
maintainerHi Johan,
Quoted 11 lines
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 Johan Hedberg <[email protected]>---
include/net/bluetooth/hci_core.h | 3 ++- net/bluetooth/hci_sock.c | 9 +++++---- net/bluetooth/mgmt.c | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel