aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/bluetooth/l2cap.c')
-rw-r--r--net/bluetooth/l2cap.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index e322be8ff948..33e134b0d402 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -1420,7 +1420,7 @@ static inline void l2cap_do_send(struct sock *sk, struct sk_buff *skb)
1420 hci_send_acl(pi->conn->hcon, skb, 0); 1420 hci_send_acl(pi->conn->hcon, skb, 0);
1421} 1421}
1422 1422
1423static int l2cap_streaming_send(struct sock *sk) 1423static void l2cap_streaming_send(struct sock *sk)
1424{ 1424{
1425 struct sk_buff *skb, *tx_skb; 1425 struct sk_buff *skb, *tx_skb;
1426 struct l2cap_pinfo *pi = l2cap_pi(sk); 1426 struct l2cap_pinfo *pi = l2cap_pi(sk);
@@ -1450,7 +1450,6 @@ static int l2cap_streaming_send(struct sock *sk)
1450 skb = skb_dequeue(TX_QUEUE(sk)); 1450 skb = skb_dequeue(TX_QUEUE(sk));
1451 kfree_skb(skb); 1451 kfree_skb(skb);
1452 } 1452 }
1453 return 0;
1454} 1453}
1455 1454
1456static void l2cap_retransmit_one_frame(struct sock *sk, u8 tx_seq) 1455static void l2cap_retransmit_one_frame(struct sock *sk, u8 tx_seq)
@@ -1866,7 +1865,7 @@ static int l2cap_sock_sendmsg(struct kiocb *iocb, struct socket *sock, struct ms
1866 } 1865 }
1867 1866
1868 if (pi->mode == L2CAP_MODE_STREAMING) { 1867 if (pi->mode == L2CAP_MODE_STREAMING) {
1869 err = l2cap_streaming_send(sk); 1868 l2cap_streaming_send(sk);
1870 } else { 1869 } else {
1871 if (pi->conn_state & L2CAP_CONN_REMOTE_BUSY && 1870 if (pi->conn_state & L2CAP_CONN_REMOTE_BUSY &&
1872 pi->conn_state && L2CAP_CONN_WAIT_F) { 1871 pi->conn_state && L2CAP_CONN_WAIT_F) {