Skip to content

Commit

Permalink
Bluetooth: Remove unnecessary queue_monitor_skb() function
Browse files Browse the repository at this point in the history
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: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
Johan Hedberg authored and Marcel Holtmann committed Feb 20, 2015
1 parent 7129069 commit 03f310e
Showing 1 changed file with 2 additions and 30 deletions.
32 changes: 2 additions & 30 deletions net/bluetooth/hci_sock.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);
}
}
Expand Down

0 comments on commit 03f310e

Please sign in to comment.