Bluetooth: mgmt: Add convenience function for sending New Settings

The New Settings event needs to be sent from quite many places so it
makes sense to have a convenience function for it to simplify the code.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>

1 files changed, 44 insertions, 52 deletions

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 86e63a707f5a..439ec786ff8c 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -796,6 +796,42 @@ failed:
         return err;
 }
 
+static int mgmt_event(u16 event, struct hci_dev *hdev, void *data,
+                                        u16 data_len, struct sock *skip_sk)
+{
+        struct sk_buff *skb;
+        struct mgmt_hdr *hdr;
+
+        skb = alloc_skb(sizeof(*hdr) + data_len, GFP_ATOMIC);
+        if (!skb)
+                return -ENOMEM;
+
+        hdr = (void *) skb_put(skb, sizeof(*hdr));
+        hdr->opcode = cpu_to_le16(event);
+        if (hdev)
+                hdr->index = cpu_to_le16(hdev->id);
+        else
+                hdr->index = cpu_to_le16(MGMT_INDEX_NONE);
+        hdr->len = cpu_to_le16(data_len);
+
+        if (data)
+                memcpy(skb_put(skb, data_len), data, data_len);
+
+        hci_send_to_control(skb, skip_sk);
+        kfree_skb(skb);
+
+        return 0;
+}
+
+static int new_settings(struct hci_dev *hdev, struct sock *skip)
+{
+        __le32 ev;
+
+        ev = cpu_to_le32(get_current_settings(hdev));
+
+        return mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev), skip);
+}
+
 static int set_discoverable(struct sock *sk, u16 index, void *data, u16 len)
 {
         struct mgmt_cp_set_discoverable *cp = data;
@@ -951,38 +987,10 @@ failed:
         return err;
 }
 
-static int mgmt_event(u16 event, struct hci_dev *hdev, void *data,
-                                        u16 data_len, struct sock *skip_sk)
-{
-        struct sk_buff *skb;
-        struct mgmt_hdr *hdr;
-
-        skb = alloc_skb(sizeof(*hdr) + data_len, GFP_ATOMIC);
-        if (!skb)
-                return -ENOMEM;
-
-        hdr = (void *) skb_put(skb, sizeof(*hdr));
-        hdr->opcode = cpu_to_le16(event);
-        if (hdev)
-                hdr->index = cpu_to_le16(hdev->id);
-        else
-                hdr->index = cpu_to_le16(MGMT_INDEX_NONE);
-        hdr->len = cpu_to_le16(data_len);
-
-        if (data)
-                memcpy(skb_put(skb, data_len), data, data_len);
-
-        hci_send_to_control(skb, skip_sk);
-        kfree_skb(skb);
-
-        return 0;
-}
-
 static int set_pairable(struct sock *sk, u16 index, void *data, u16 len)
 {
         struct mgmt_mode *cp = data;
         struct hci_dev *hdev;
-        __le32 ev;
         int err;
 
         BT_DBG("request for hci%u", index);
@@ -1007,9 +1015,7 @@ static int set_pairable(struct sock *sk, u16 index, void *data, u16 len)
         if (err < 0)
                 goto failed;
 
-        ev = cpu_to_le32(get_current_settings(hdev));
-
-        err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev), sk);
+        err = new_settings(hdev, sk);
 
 failed:
         hci_dev_unlock(hdev);
@@ -2902,7 +2908,6 @@ static void settings_rsp(struct pending_cmd *cmd, void *data)
 int mgmt_powered(struct hci_dev *hdev, u8 powered)
 {
         struct cmd_lookup match = { NULL, hdev };
-        __le32 ev;
         int err;
 
         if (!test_bit(HCI_MGMT, &hdev->dev_flags))
@@ -2925,10 +2930,7 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered)
                 mgmt_pending_foreach(0, hdev, cmd_status_rsp, &status);
         }
 
-        ev = cpu_to_le32(get_current_settings(hdev));
-
-        err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev),
-                                                                match.sk);
+        err = new_settings(hdev, match.sk);
 
         if (match.sk)
                 sock_put(match.sk);
@@ -2952,11 +2954,8 @@ int mgmt_discoverable(struct hci_dev *hdev, u8 discoverable)
                         changed = true;
         }
 
-        if (changed) {
-                __le32 ev = cpu_to_le32(get_current_settings(hdev));
-                err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev),
-                                                                match.sk);
-        }
+        if (changed)
+                err = new_settings(hdev, match.sk);
 
         if (match.sk)
                 sock_put(match.sk);
@@ -2981,11 +2980,8 @@ int mgmt_connectable(struct hci_dev *hdev, u8 connectable)
                         changed = true;
         }
 
-        if (changed) {
-                __le32 ev = cpu_to_le32(get_current_settings(hdev));
-                err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev),
-                                                                match.sk);
-        }
+        if (changed)
+                err = new_settings(hdev, match.sk);
 
         if (match.sk)
                 sock_put(match.sk);
@@ -3320,7 +3316,6 @@ int mgmt_auth_failed(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
 int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status)
 {
         struct cmd_lookup match = { NULL, hdev };
-        __le32 ev;
         int err;
 
         if (status) {
@@ -3333,8 +3328,7 @@ int mgmt_auth_enable_complete(struct hci_dev *hdev, u8 status)
         mgmt_pending_foreach(MGMT_OP_SET_LINK_SECURITY, hdev, settings_rsp,
                                                                 &match);
 
-        ev = cpu_to_le32(get_current_settings(hdev));
-        err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev), match.sk);
+        err = new_settings(hdev, match.sk);
 
         if (match.sk)
                 sock_put(match.sk);
@@ -3357,7 +3351,6 @@ static int clear_eir(struct hci_dev *hdev)
 int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 status)
 {
         struct cmd_lookup match = { NULL, hdev };
-        __le32 ev;
         int err;
 
         if (status) {
@@ -3369,8 +3362,7 @@ int mgmt_ssp_enable_complete(struct hci_dev *hdev, u8 status)
 
         mgmt_pending_foreach(MGMT_OP_SET_SSP, hdev, settings_rsp, &match);
 
-        ev = cpu_to_le32(get_current_settings(hdev));
-        err = mgmt_event(MGMT_EV_NEW_SETTINGS, hdev, &ev, sizeof(ev), match.sk);
+        err = new_settings(hdev, match.sk);
 
         if (match.sk) {
                 sock_put(match.sk);