diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-05-01 15:15:43 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2010-05-10 03:28:51 -0400 |
commit | 59203a21a56c53afeb6f45e059299e6f1437f30f (patch) | |
tree | 55fba6655c234256d05b38e47fe05fb24a8812d7 /net/bluetooth/l2cap.c | |
parent | 44651b85cc3a076147af5d181fc4833ef8debc59 (diff) |
Bluetooth: Fix errors reported by checkpatch.pl
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: João Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/l2cap.c')
-rw-r--r-- | net/bluetooth/l2cap.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index cfb18cd97564..2a981de071df 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
@@ -1400,7 +1400,7 @@ static int l2cap_ertm_send(struct sock *sk) | |||
1400 | return 0; | 1400 | return 0; |
1401 | 1401 | ||
1402 | while ((skb = sk->sk_send_head) && (!l2cap_tx_window_full(sk)) && | 1402 | while ((skb = sk->sk_send_head) && (!l2cap_tx_window_full(sk)) && |
1403 | !(pi->conn_state & L2CAP_CONN_REMOTE_BUSY)) { | 1403 | !(pi->conn_state & L2CAP_CONN_REMOTE_BUSY)) { |
1404 | 1404 | ||
1405 | if (pi->remote_max_tx && | 1405 | if (pi->remote_max_tx && |
1406 | bt_cb(skb)->retries == pi->remote_max_tx) { | 1406 | bt_cb(skb)->retries == pi->remote_max_tx) { |
@@ -1490,9 +1490,8 @@ static inline int l2cap_skbuff_fromiovec(struct sock *sk, struct msghdr *msg, in | |||
1490 | struct sk_buff **frag; | 1490 | struct sk_buff **frag; |
1491 | int err, sent = 0; | 1491 | int err, sent = 0; |
1492 | 1492 | ||
1493 | if (memcpy_fromiovec(skb_put(skb, count), msg->msg_iov, count)) { | 1493 | if (memcpy_fromiovec(skb_put(skb, count), msg->msg_iov, count)) |
1494 | return -EFAULT; | 1494 | return -EFAULT; |
1495 | } | ||
1496 | 1495 | ||
1497 | sent += count; | 1496 | sent += count; |
1498 | len -= count; | 1497 | len -= count; |
@@ -3347,7 +3346,7 @@ static void l2cap_add_to_srej_queue(struct sock *sk, struct sk_buff *skb, u8 tx_ | |||
3347 | if (skb_queue_is_last(SREJ_QUEUE(sk), next_skb)) | 3346 | if (skb_queue_is_last(SREJ_QUEUE(sk), next_skb)) |
3348 | break; | 3347 | break; |
3349 | 3348 | ||
3350 | } while((next_skb = skb_queue_next(SREJ_QUEUE(sk), next_skb))); | 3349 | } while ((next_skb = skb_queue_next(SREJ_QUEUE(sk), next_skb))); |
3351 | 3350 | ||
3352 | __skb_queue_tail(SREJ_QUEUE(sk), skb); | 3351 | __skb_queue_tail(SREJ_QUEUE(sk), skb); |
3353 | } | 3352 | } |
@@ -3446,7 +3445,7 @@ static void l2cap_check_srej_gap(struct sock *sk, u8 tx_seq) | |||
3446 | struct sk_buff *skb; | 3445 | struct sk_buff *skb; |
3447 | u16 control; | 3446 | u16 control; |
3448 | 3447 | ||
3449 | while((skb = skb_peek(SREJ_QUEUE(sk)))) { | 3448 | while ((skb = skb_peek(SREJ_QUEUE(sk)))) { |
3450 | if (bt_cb(skb)->tx_seq != tx_seq) | 3449 | if (bt_cb(skb)->tx_seq != tx_seq) |
3451 | break; | 3450 | break; |
3452 | 3451 | ||
@@ -3465,7 +3464,7 @@ static void l2cap_resend_srejframe(struct sock *sk, u8 tx_seq) | |||
3465 | struct srej_list *l, *tmp; | 3464 | struct srej_list *l, *tmp; |
3466 | u16 control; | 3465 | u16 control; |
3467 | 3466 | ||
3468 | list_for_each_entry_safe(l,tmp, SREJ_LIST(sk), list) { | 3467 | list_for_each_entry_safe(l, tmp, SREJ_LIST(sk), list) { |
3469 | if (l->tx_seq == tx_seq) { | 3468 | if (l->tx_seq == tx_seq) { |
3470 | list_del(&l->list); | 3469 | list_del(&l->list); |
3471 | kfree(l); | 3470 | kfree(l); |