From: Mikel Astiz <mikel.astiz.oss@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Mikel Astiz <mikel.astiz@bmw-carit.de>,
Mikel Astiz <mikel.astiz.oss@gmail.com>
Subject: [PATCH v0 2/6] Bluetooth: Remove unnecessary check
Date: Wed, 11 Apr 2012 08:48:48 +0200 [thread overview]
Message-ID: <1334126932-27327-3-git-send-email-mikel.astiz.oss@gmail.com> (raw)
In-Reply-To: <1334126932-27327-1-git-send-email-mikel.astiz.oss@gmail.com>
From: Mikel Astiz <mikel.astiz@bmw-carit.de>
The function already fails if the given size is greater than the MTU, so
there is no need to consider that case afterwards.
Signed-off-by: Mikel Astiz <mikel.astiz.oss@gmail.com>
---
net/bluetooth/sco.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 8bf26d1..b48370b 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -234,7 +234,7 @@ static inline int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)
{
struct sco_conn *conn = sco_pi(sk)->conn;
struct sk_buff *skb;
- int err, count;
+ int err;
/* Check outgoing MTU */
if (len > conn->mtu)
@@ -242,20 +242,18 @@ static inline int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)
BT_DBG("sk %p len %d", sk, len);
- count = min_t(unsigned int, conn->mtu, len);
- skb = bt_skb_send_alloc(sk, count,
- msg->msg_flags & MSG_DONTWAIT, &err);
+ skb = bt_skb_send_alloc(sk, len, msg->msg_flags & MSG_DONTWAIT, &err);
if (!skb)
return err;
- if (memcpy_fromiovec(skb_put(skb, count), msg->msg_iov, count)) {
+ if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) {
kfree_skb(skb);
return -EFAULT;
}
hci_send_sco(conn->hcon, skb);
- return count;
+ return len;
}
static inline void sco_recv_frame(struct sco_conn *conn, struct sk_buff *skb)
--
1.7.7.6
next prev parent reply other threads:[~2012-04-11 6:48 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-11 6:48 [PATCH v0 0/6] Multiple Bluetooth SCO connections Mikel Astiz
2012-04-11 6:48 ` [PATCH v0 1/6] Bluetooth: Use unsigned int instead of signed int Mikel Astiz
2012-04-11 9:21 ` Marcel Holtmann
2012-04-13 21:59 ` Gustavo Padovan
2012-04-11 6:48 ` Mikel Astiz [this message]
2012-04-11 9:22 ` [PATCH v0 2/6] Bluetooth: Remove unnecessary check Marcel Holtmann
2012-04-13 22:01 ` Gustavo Padovan
2012-04-11 6:48 ` [PATCH v0 3/6] Bluetooth: Remove unused HCI event handling Mikel Astiz
2012-04-11 9:23 ` Marcel Holtmann
2012-04-11 15:27 ` Mikel Astiz
2012-04-11 6:48 ` [PATCH v0 4/6] Bluetooth: Simplify outgoing SCO scheduling code Mikel Astiz
2012-04-11 9:24 ` Marcel Holtmann
2012-04-11 11:43 ` Luiz Augusto von Dentz
2012-04-11 15:23 ` Mikel Astiz
2012-04-11 15:34 ` Marcel Holtmann
2012-04-12 5:58 ` Mikel Astiz
2012-04-12 9:52 ` Marcel Holtmann
2012-04-11 6:48 ` [PATCH v0 5/6] Bluetooth: btusb: Dynamic alternate setting Mikel Astiz
2012-04-11 9:26 ` Marcel Holtmann
2012-04-16 21:46 ` Gustavo Padovan
2012-04-17 9:26 ` Marcel Holtmann
2012-04-17 10:47 ` Gustavo Padovan
2012-04-11 6:48 ` [PATCH v0 6/6] Bluetooth: Remove outgoing MTU check Mikel Astiz
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=1334126932-27327-3-git-send-email-mikel.astiz.oss@gmail.com \
--to=mikel.astiz.oss@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=mikel.astiz@bmw-carit.de \
/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).