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

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

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: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent 7024728e

net/bluetooth/hci_conn.c

+1 −1
Original line number Diff line number Diff line
@@ -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 {

net/bluetooth/l2cap_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

net/bluetooth/l2cap_sock.c

+2 −1
Original line number Diff line number Diff line
@@ -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)

net/bluetooth/mgmt.c

+2 −1
Original line number Diff line number Diff line
@@ -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

net/bluetooth/smp.c

+2 −1
Original line number Diff line number Diff line
@@ -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)