Commit 9b4c3336 authored by Arron Wang's avatar Arron Wang Committed by Marcel Holtmann
Browse files

Bluetooth: Make l2cap_recv_acldata() and sco_recv_scodata() return void 



The return value of l2cap_recv_acldata() and sco_recv_scodata()
are not used, then change it to return void

Signed-off-by: default avatarArron Wang <arron.wang@intel.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 867146a0

include/net/bluetooth/hci_core.h

+2 −2
Original line number Diff line number Diff line
@@ -530,10 +530,10 @@ extern struct mutex hci_cb_list_lock; 
/* ----- HCI interface to upper protocols ----- */

int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr);

int l2cap_disconn_ind(struct hci_conn *hcon);

int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags);

void l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags);



int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags);

int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb);

void sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb);



/* ----- Inquiry cache ----- */

#define INQUIRY_CACHE_AGE_MAX   (HZ*30)   /* 30 seconds */

net/bluetooth/l2cap_core.c

+2 −3
Original line number Diff line number Diff line
@@ -7442,7 +7442,7 @@ static void l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt) 
	mutex_unlock(&conn->chan_lock);

}



int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags)

void l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags)

{

	struct l2cap_conn *conn = hcon->l2cap_data;

	struct l2cap_hdr *hdr;
@@ -7485,7 +7485,7 @@ int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags) 
		if (len == skb->len) {

			/* Complete frame received */

			l2cap_recv_frame(conn, skb);

			return 0;

			return;

		}



		BT_DBG("Start: total len %d, frag len %d", len, skb->len);
@@ -7544,7 +7544,6 @@ int l2cap_recv_acldata(struct hci_conn *hcon, struct sk_buff *skb, u16 flags) 


drop:

	kfree_skb(skb);

	return 0;

}



static struct hci_cb l2cap_cb = {

net/bluetooth/sco.c

+2 −3
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ static void sco_disconn_cfm(struct hci_conn *hcon, __u8 reason) 
	sco_conn_del(hcon, bt_to_errno(reason));

}



int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb)

void sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb)

{

	struct sco_conn *conn = hcon->sco_data;
@@ -1121,12 +1121,11 @@ int sco_recv_scodata(struct hci_conn *hcon, struct sk_buff *skb) 


	if (skb->len) {

		sco_recv_frame(conn, skb);

		return 0;

		return;

	}



drop:

	kfree_skb(skb);

	return 0;

}



static struct hci_cb sco_cb = {