aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/bluetooth/l2cap.h1
-rw-r--r--net/bluetooth/l2cap_sock.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 0a0134161b1b..c34b1c126363 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -441,7 +441,6 @@ static inline int l2cap_tx_window_full(struct l2cap_chan *ch)
441#define __is_sar_start(ctrl) (((ctrl) & L2CAP_CTRL_SAR) == L2CAP_SDU_START) 441#define __is_sar_start(ctrl) (((ctrl) & L2CAP_CTRL_SAR) == L2CAP_SDU_START)
442 442
443extern int disable_ertm; 443extern int disable_ertm;
444extern const struct proto_ops l2cap_sock_ops;
445extern struct bt_sock_list l2cap_sk_list; 444extern struct bt_sock_list l2cap_sk_list;
446 445
447int l2cap_init_sockets(void); 446int l2cap_init_sockets(void);
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 0e23ebdf7c8f..09cc7a005349 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -30,6 +30,8 @@
30#include <net/bluetooth/hci_core.h> 30#include <net/bluetooth/hci_core.h>
31#include <net/bluetooth/l2cap.h> 31#include <net/bluetooth/l2cap.h>
32 32
33static const struct proto_ops l2cap_sock_ops;
34
33/* ---- L2CAP timers ---- */ 35/* ---- L2CAP timers ---- */
34static void l2cap_sock_timeout(unsigned long arg) 36static void l2cap_sock_timeout(unsigned long arg)
35{ 37{
@@ -1106,7 +1108,7 @@ static int l2cap_sock_create(struct net *net, struct socket *sock, int protocol,
1106 return 0; 1108 return 0;
1107} 1109}
1108 1110
1109const struct proto_ops l2cap_sock_ops = { 1111static const struct proto_ops l2cap_sock_ops = {
1110 .family = PF_BLUETOOTH, 1112 .family = PF_BLUETOOTH,
1111 .owner = THIS_MODULE, 1113 .owner = THIS_MODULE,
1112 .release = l2cap_sock_release, 1114 .release = l2cap_sock_release,