Bladeren bron

Bluetooth: Move smp.h header file into net/bluetooth/

The smp.h header file is only used internally by the bluetooth.ko
module and is not a public API. So make it local to the core
Bluetooth module.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Marcel Holtmann 11 jaren geleden
bovenliggende
commit
ac4b723661
6 gewijzigde bestanden met toevoegingen van 8 en 5 verwijderingen
  1. 1 1
      net/bluetooth/hci_conn.c
  2. 1 1
      net/bluetooth/l2cap_core.c
  3. 2 1
      net/bluetooth/l2cap_sock.c
  4. 2 1
      net/bluetooth/mgmt.c
  5. 2 1
      net/bluetooth/smp.c
  6. 0 0
      net/bluetooth/smp.h

+ 1 - 1
net/bluetooth/hci_conn.c

@@ -28,8 +28,8 @@
 
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
-#include <net/bluetooth/smp.h>
 
+#include "smp.h"
 #include "a2mp.h"
 
 struct sco_param {

+ 1 - 1
net/bluetooth/l2cap_core.c

@@ -36,8 +36,8 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/l2cap.h>
-#include <net/bluetooth/smp.h>
 
+#include "smp.h"
 #include "a2mp.h"
 #include "amp.h"
 

+ 2 - 1
net/bluetooth/l2cap_sock.c

@@ -32,7 +32,8 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/l2cap.h>
-#include <net/bluetooth/smp.h>
+
+#include "smp.h"
 
 static struct bt_sock_list l2cap_sk_list = {
 	.lock = __RW_LOCK_UNLOCKED(l2cap_sk_list.lock)

+ 2 - 1
net/bluetooth/mgmt.c

@@ -30,7 +30,8 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/mgmt.h>
-#include <net/bluetooth/smp.h>
+
+#include "smp.h"
 
 #define MGMT_VERSION	1
 #define MGMT_REVISION	4

+ 2 - 1
net/bluetooth/smp.c

@@ -28,7 +28,8 @@
 #include <net/bluetooth/hci_core.h>
 #include <net/bluetooth/l2cap.h>
 #include <net/bluetooth/mgmt.h>
-#include <net/bluetooth/smp.h>
+
+#include "smp.h"
 
 #define SMP_TIMEOUT	msecs_to_jiffies(30000)
 

+ 0 - 0
include/net/bluetooth/smp.h → net/bluetooth/smp.h