Commit 0d861d8b authored by Gustavo F. Padovan's avatar Gustavo F. Padovan Committed by Marcel Holtmann

Bluetooth: Make hci_send_sco() void

It also removes an unneeded check for the MTU. The check is done before
on sco_send_frame()
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: default avatarJoão Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 4f7ac181
...@@ -637,7 +637,7 @@ int hci_unregister_notifier(struct notifier_block *nb); ...@@ -637,7 +637,7 @@ int hci_unregister_notifier(struct notifier_block *nb);
int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param); int hci_send_cmd(struct hci_dev *hdev, __u16 opcode, __u32 plen, void *param);
int hci_send_acl(struct hci_conn *conn, struct sk_buff *skb, __u16 flags); int hci_send_acl(struct hci_conn *conn, struct sk_buff *skb, __u16 flags);
int hci_send_sco(struct hci_conn *conn, struct sk_buff *skb); void hci_send_sco(struct hci_conn *conn, struct sk_buff *skb);
void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 opcode); void *hci_sent_cmd_data(struct hci_dev *hdev, __u16 opcode);
......
...@@ -1308,18 +1308,13 @@ int hci_send_acl(struct hci_conn *conn, struct sk_buff *skb, __u16 flags) ...@@ -1308,18 +1308,13 @@ int hci_send_acl(struct hci_conn *conn, struct sk_buff *skb, __u16 flags)
EXPORT_SYMBOL(hci_send_acl); EXPORT_SYMBOL(hci_send_acl);
/* Send SCO data */ /* Send SCO data */
int hci_send_sco(struct hci_conn *conn, struct sk_buff *skb) void hci_send_sco(struct hci_conn *conn, struct sk_buff *skb)
{ {
struct hci_dev *hdev = conn->hdev; struct hci_dev *hdev = conn->hdev;
struct hci_sco_hdr hdr; struct hci_sco_hdr hdr;
BT_DBG("%s len %d", hdev->name, skb->len); BT_DBG("%s len %d", hdev->name, skb->len);
if (skb->len > hdev->sco_mtu) {
kfree_skb(skb);
return -EINVAL;
}
hdr.handle = cpu_to_le16(conn->handle); hdr.handle = cpu_to_le16(conn->handle);
hdr.dlen = skb->len; hdr.dlen = skb->len;
...@@ -1332,8 +1327,6 @@ int hci_send_sco(struct hci_conn *conn, struct sk_buff *skb) ...@@ -1332,8 +1327,6 @@ int hci_send_sco(struct hci_conn *conn, struct sk_buff *skb)
skb_queue_tail(&conn->data_q, skb); skb_queue_tail(&conn->data_q, skb);
tasklet_schedule(&hdev->tx_task); tasklet_schedule(&hdev->tx_task);
return 0;
} }
EXPORT_SYMBOL(hci_send_sco); EXPORT_SYMBOL(hci_send_sco);
......
...@@ -249,8 +249,7 @@ static inline int sco_send_frame(struct sock *sk, struct msghdr *msg, int len) ...@@ -249,8 +249,7 @@ static inline int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)
goto fail; goto fail;
} }
if ((err = hci_send_sco(conn->hcon, skb)) < 0) hci_send_sco(conn->hcon, skb);
return err;
return count; return count;
......
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