luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Arron Wang <arron.wang@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Arron Wang 2015-06-09 17:47:22 +08:00 committed by Marcel Holtmann
parent 867146a0d2
commit 9b4c33364e
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/net/bluetooth/hci_core.h
View File

@ -530,10 +530,10 @@ extern struct mutex hci_cb_list_lock;
/* ----- HCI interface to upper protocols ----- */ /* ----- HCI interface to upper protocols ----- */
int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr); int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr);
int l2cap_disconn_ind(struct hci_conn *hcon); 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_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 ----- */ /* ----- Inquiry cache ----- */
#define INQUIRY_CACHE_AGE_MAX (HZ*30) /* 30 seconds */ #define INQUIRY_CACHE_AGE_MAX (HZ*30) /* 30 seconds */

5
net/bluetooth/l2cap_core.c
View File

@ -7442,7 +7442,7 @@ static void l2cap_security_cfm(struct hci_conn *hcon, u8 status, u8 encrypt)
mutex_unlock(&conn->chan_lock); 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_conn *conn = hcon->l2cap_data;
struct l2cap_hdr *hdr; 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) { if (len == skb->len) {
/* Complete frame received */ /* Complete frame received */
l2cap_recv_frame(conn, skb); l2cap_recv_frame(conn, skb);
return 0; return;
} }
BT_DBG("Start: total len %d, frag len %d", len, skb->len); 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: drop:
kfree_skb(skb); kfree_skb(skb);
return 0;
} }
static struct hci_cb l2cap_cb = { static struct hci_cb l2cap_cb = {

5
net/bluetooth/sco.c
View File

@ -1110,7 +1110,7 @@ static void sco_disconn_cfm(struct hci_conn *hcon, __u8 reason)
sco_conn_del(hcon, bt_to_errno(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; 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) { if (skb->len) {
sco_recv_frame(conn, skb); sco_recv_frame(conn, skb);
return 0; return;
} }
drop: drop:
kfree_skb(skb); kfree_skb(skb);
return 0;
} }
static struct hci_cb sco_cb = { static struct hci_cb sco_cb = {