diff options
Diffstat (limited to 'net/bluetooth/sco.c')
| -rw-r--r-- | net/bluetooth/sco.c | 16 | 
1 files changed, 11 insertions, 5 deletions
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c index 3589e21edb0..dc42b917aaa 100644 --- a/net/bluetooth/sco.c +++ b/net/bluetooth/sco.c @@ -912,7 +912,7 @@ int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr)  	return lm;  } -int sco_connect_cfm(struct hci_conn *hcon, __u8 status) +void sco_connect_cfm(struct hci_conn *hcon, __u8 status)  {  	BT_DBG("hcon %p bdaddr %s status %d", hcon, batostr(&hcon->dst), status);  	if (!status) { @@ -923,16 +923,13 @@ int sco_connect_cfm(struct hci_conn *hcon, __u8 status)  			sco_conn_ready(conn);  	} else  		sco_conn_del(hcon, bt_to_errno(status)); - -	return 0;  } -int sco_disconn_cfm(struct hci_conn *hcon, __u8 reason) +void sco_disconn_cfm(struct hci_conn *hcon, __u8 reason)  {  	BT_DBG("hcon %p reason %d", hcon, reason);  	sco_conn_del(hcon, bt_to_errno(reason)); -	return 0;  }  int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb) @@ -1025,6 +1022,13 @@ int __init sco_init(void)  		goto error;  	} +	err = bt_procfs_init(THIS_MODULE, &init_net, "sco", &sco_sk_list, NULL); +	if (err < 0) { +		BT_ERR("Failed to create SCO proc file"); +		bt_sock_unregister(BTPROTO_SCO); +		goto error; +	} +  	if (bt_debugfs) {  		sco_debugfs = debugfs_create_file("sco", 0444, bt_debugfs,  						  NULL, &sco_debugfs_fops); @@ -1043,6 +1047,8 @@ error:  void __exit sco_exit(void)  { +	bt_procfs_cleanup(&init_net, "sco"); +  	debugfs_remove(sco_debugfs);  	if (bt_sock_unregister(BTPROTO_SCO) < 0)  |