Skip to content

Commit c531a12

Browse files
author
Gustavo F. Padovan
committed
Bluetooth: remove l2cap_load() hack
l2cap_load() was added to trigger l2cap.ko module loading from the RFCOMM and BNEP modules. Now that L2CAP module is gone, we don't need it anymore. Signed-off-by: Gustavo F. Padovan <[email protected]>
1 parent 6427451 commit c531a12

File tree

6 files changed

+0
-18
lines changed

6 files changed

+0
-18
lines changed

include/net/bluetooth/l2cap.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,4 @@ void l2cap_send_disconn_req(struct l2cap_conn *conn, struct sock *sk, int err);
455455
void l2cap_chan_del(struct sock *sk, int err);
456456
int l2cap_do_connect(struct sock *sk);
457457

458-
void l2cap_load(void);
459-
460458
#endif /* __L2CAP_H */

net/bluetooth/bnep/core.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -708,8 +708,6 @@ static int __init bnep_init(void)
708708
{
709709
char flt[50] = "";
710710

711-
l2cap_load();
712-
713711
#ifdef CONFIG_BT_BNEP_PROTO_FILTER
714712
strcat(flt, "protocol ");
715713
#endif

net/bluetooth/cmtp/core.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,6 @@ int cmtp_get_conninfo(struct cmtp_conninfo *ci)
469469

470470
static int __init cmtp_init(void)
471471
{
472-
l2cap_load();
473-
474472
BT_INFO("CMTP (CAPI Emulation) ver %s", VERSION);
475473

476474
cmtp_init_sockets();

net/bluetooth/hidp/core.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1019,8 +1019,6 @@ static int __init hidp_init(void)
10191019
{
10201020
int ret;
10211021

1022-
l2cap_load();
1023-
10241022
BT_INFO("HIDP (Human Interface Emulation) ver %s", VERSION);
10251023

10261024
ret = hid_register_driver(&hidp_driver);

net/bluetooth/l2cap_core.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3855,13 +3855,5 @@ void l2cap_exit(void)
38553855
l2cap_cleanup_sockets();
38563856
}
38573857

3858-
void l2cap_load(void)
3859-
{
3860-
/* Dummy function to trigger automatic L2CAP module loading by
3861-
* other modules that use L2CAP sockets but don't use any other
3862-
* symbols from it. */
3863-
}
3864-
EXPORT_SYMBOL(l2cap_load);
3865-
38663858
module_param(disable_ertm, bool, 0644);
38673859
MODULE_PARM_DESC(disable_ertm, "Disable enhanced retransmission mode");

net/bluetooth/rfcomm/core.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2154,8 +2154,6 @@ static int __init rfcomm_init(void)
21542154
{
21552155
int err;
21562156

2157-
l2cap_load();
2158-
21592157
hci_register_cb(&rfcomm_cb);
21602158

21612159
rfcomm_thread = kthread_run(rfcomm_run, NULL, "krfcommd");

0 commit comments

Comments
 (0)