From: "Gustavo F. Padovan" <padovan@profusion.mobi>
To: linux-bluetooth@vger.kernel.org
Cc: marcel@holtmann.org, gustavo@padovan.org, jprvita@profusion.mobi
Subject: [PATCH 31/34] Bluetooth: Make hci_send_sco() void
Date: Thu, 1 Apr 2010 17:23:49 -0300 [thread overview]
Message-ID: <1270153432-6477-32-git-send-email-padovan@profusion.mobi> (raw)
In-Reply-To: <1270153432-6477-31-git-send-email-padovan@profusion.mobi>
It also removes an unneeded check for the MTU. The is done before on
sco_send_frame()
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: João Paulo Rechi Vita <jprvita@profusion.mobi>
---
include/net/bluetooth/hci_core.h | 2 +-
net/bluetooth/hci_core.c | 9 +--------
net/bluetooth/sco.c | 3 +--
3 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 21ff787..4511df2 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -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);
void 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);
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index cc8074b..904f1e8 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -1308,18 +1308,13 @@ void hci_send_acl(struct hci_conn *conn, struct sk_buff *skb, __u16 flags)
EXPORT_SYMBOL(hci_send_acl);
/* 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_sco_hdr hdr;
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.dlen = skb->len;
@@ -1332,8 +1327,6 @@ int hci_send_sco(struct hci_conn *conn, struct sk_buff *skb)
skb_queue_tail(&conn->data_q, skb);
tasklet_schedule(&hdev->tx_task);
-
- return 0;
}
EXPORT_SYMBOL(hci_send_sco);
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index e5b16b7..50a9af8 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -249,8 +249,7 @@ static inline int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)
goto fail;
}
- if ((err = hci_send_sco(conn->hcon, skb)) < 0)
- return err;
+ hci_send_sco(conn->hcon, skb);
return count;
--
1.6.4.4
next prev parent reply other threads:[~2010-04-01 20:23 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-01 20:23 Patches for eL2CAP Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 01/34] Bluetooth: Implement 'Send IorRRorRNR' event Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 02/34] Bluetooth: Support case with F bit set under WAIT_F state Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 03/34] Bluetooth: Fix memory leak of S-frames into L2CAP Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 04/34] Bluetooth: Check the minimum {I,S}-frame size " Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 05/34] Bluetooth: Check if SDU size is greater than MTU on L2CAP Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 06/34] Bluetooth: Fix expected_tx_seq calculation " Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 07/34] Bluetooth: Implement SendAck() Action on ERTM Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 08/34] Bluetooth: Move set of P-bit to l2cap_send_sframe() Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 09/34] Bluetooth: Add Recv RR (P=0)(F=0) for SREJ_SENT state on ERTM Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 10/34] Bluetooth: Use a l2cap_pinfo struct instead l2cap_pi() macro Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 11/34] Bluetooth: Fix ACL MTU issue Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 12/34] Bluetooth: Split l2cap_data_channel_sframe() Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 13/34] Bluetooth: Handle all cases of receipt of RNR-frames into L2CAP Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 14/34] Bluetooth: Group the ack of I-frames into l2cap_data_channel_rrframe() Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 15/34] Bluetooth: Remove duplicate use of __get_reqseq() macro on L2CAP Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 16/34] Bluetooth: Finish implementation for Rec RR (P=1) on ERTM Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 17/34] Bluetooth: Ignore I-frames with a duplicated txSeq Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 18/34] Bluetooth: Add timer to Acknowledge I-frames Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 19/34] Bluetooth: Move specific Basic Mode code to the right place Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 20/34] Bluetooth: Ignore Tx Window value with Streaming mode Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 21/34] Bluetooth: Read RFC conf option on a successful Conf RSP Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 22/34] Bluetooth: Fix configuration of the MPS value Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 23/34] Bluetooth: Add le16 macro to Retransmission and Monitor Timeouts values Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 24/34] Bluetooth: Check the SDU size against the MTU value Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 25/34] Bluetooth: Send Ack after clear the SREJ list Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 26/34] Bluetooth: Add sockopt configuration for txWindow on L2CAP Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 27/34] Bluetooth: Change acknowledgement to use the value of txWindow Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 28/34] Bluetooth: Add module parameter for txWindow size on L2CAP Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 29/34] Bluetooth: Enable option to configure Max Transmission value via sockopt Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 30/34] Bluetooth: Make hci_send_acl() void Gustavo F. Padovan
2010-04-01 20:23 ` Gustavo F. Padovan [this message]
2010-04-01 20:23 ` [PATCH 32/34] Bluetooth: Return the data length sent on connectionless channels Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 33/34] Bluetooth: Clean sco_send_frame() flow Gustavo F. Padovan
2010-04-01 20:23 ` [PATCH 34/34] Bluetooth: Remove unneeded check for MTU on sco_send_frame() Gustavo F. Padovan
2010-04-19 20:15 ` Patches for eL2CAP Gustavo F. Padovan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1270153432-6477-32-git-send-email-padovan@profusion.mobi \
--to=padovan@profusion.mobi \
--cc=gustavo@padovan.org \
--cc=jprvita@profusion.mobi \
--cc=linux-bluetooth@vger.kernel.org \
--cc=marcel@holtmann.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).