Skip to content

Commit

Permalink
Bluetooth: Remove unnecessary check
Browse files Browse the repository at this point in the history
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>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo@padovan.org>
  • Loading branch information
Mikel Astiz authored and Gustavo Padovan committed May 9, 2012
1 parent abc5de8 commit 088ce08
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions net/bluetooth/sco.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,28 +233,26 @@ 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)
return -EINVAL;

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)
Expand Down

0 comments on commit 088ce08

Please sign in to comment.