Commit c531a12a authored by Gustavo F. Padovan's avatar Gustavo F. Padovan

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: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent 64274518
...@@ -455,6 +455,4 @@ void l2cap_send_disconn_req(struct l2cap_conn *conn, struct sock *sk, int err); ...@@ -455,6 +455,4 @@ void l2cap_send_disconn_req(struct l2cap_conn *conn, struct sock *sk, int err);
void l2cap_chan_del(struct sock *sk, int err); void l2cap_chan_del(struct sock *sk, int err);
int l2cap_do_connect(struct sock *sk); int l2cap_do_connect(struct sock *sk);
void l2cap_load(void);
#endif /* __L2CAP_H */ #endif /* __L2CAP_H */
...@@ -708,8 +708,6 @@ static int __init bnep_init(void) ...@@ -708,8 +708,6 @@ static int __init bnep_init(void)
{ {
char flt[50] = ""; char flt[50] = "";
l2cap_load();
#ifdef CONFIG_BT_BNEP_PROTO_FILTER #ifdef CONFIG_BT_BNEP_PROTO_FILTER
strcat(flt, "protocol "); strcat(flt, "protocol ");
#endif #endif
......
...@@ -469,8 +469,6 @@ int cmtp_get_conninfo(struct cmtp_conninfo *ci) ...@@ -469,8 +469,6 @@ int cmtp_get_conninfo(struct cmtp_conninfo *ci)
static int __init cmtp_init(void) static int __init cmtp_init(void)
{ {
l2cap_load();
BT_INFO("CMTP (CAPI Emulation) ver %s", VERSION); BT_INFO("CMTP (CAPI Emulation) ver %s", VERSION);
cmtp_init_sockets(); cmtp_init_sockets();
......
...@@ -1019,8 +1019,6 @@ static int __init hidp_init(void) ...@@ -1019,8 +1019,6 @@ static int __init hidp_init(void)
{ {
int ret; int ret;
l2cap_load();
BT_INFO("HIDP (Human Interface Emulation) ver %s", VERSION); BT_INFO("HIDP (Human Interface Emulation) ver %s", VERSION);
ret = hid_register_driver(&hidp_driver); ret = hid_register_driver(&hidp_driver);
......
...@@ -3855,13 +3855,5 @@ void l2cap_exit(void) ...@@ -3855,13 +3855,5 @@ void l2cap_exit(void)
l2cap_cleanup_sockets(); l2cap_cleanup_sockets();
} }
void l2cap_load(void)
{
/* Dummy function to trigger automatic L2CAP module loading by
* other modules that use L2CAP sockets but don't use any other
* symbols from it. */
}
EXPORT_SYMBOL(l2cap_load);
module_param(disable_ertm, bool, 0644); module_param(disable_ertm, bool, 0644);
MODULE_PARM_DESC(disable_ertm, "Disable enhanced retransmission mode"); MODULE_PARM_DESC(disable_ertm, "Disable enhanced retransmission mode");
...@@ -2154,8 +2154,6 @@ static int __init rfcomm_init(void) ...@@ -2154,8 +2154,6 @@ static int __init rfcomm_init(void)
{ {
int err; int err;
l2cap_load();
hci_register_cb(&rfcomm_cb); hci_register_cb(&rfcomm_cb);
rfcomm_thread = kthread_run(rfcomm_run, NULL, "krfcommd"); rfcomm_thread = kthread_run(rfcomm_run, NULL, "krfcommd");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment