lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bluetooth: Add support for L2CAP 'Send RRorRNR' action

Browse Source 
When called, 'Send RRorRNR' should send a RNR frame if local device is
busy or a RR frame otherwise.

Signed-off-by: Gustavo F. Padovan <gustavo@las.ic.unicamp.br>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Gustavo F. Padovan
2009-08-26 04:04:03 -03:00
committed by Marcel Holtmann
parent 2246b2f1b4
commit 7e7430908c
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
net/bluetooth/l2cap.c
View File

@@ -366,6 +366,16 @@ static inline int l2cap_send_sframe(struct l2cap_pinfo *pi, u16 control)
return hci_send_acl(pi->conn->hcon, skb, 0); return hci_send_acl(pi->conn->hcon, skb, 0);
} }
static inline int l2cap_send_rr_or_rnr(struct l2cap_pinfo *pi, u16 control)
{
if (pi->conn_state & L2CAP_CONN_LOCAL_BUSY)
control |= L2CAP_SUPER_RCV_NOT_READY;
else
control |= L2CAP_SUPER_RCV_READY;
return l2cap_send_sframe(pi, control);
}
static void l2cap_do_start(struct sock *sk) static void l2cap_do_start(struct sock *sk)
{ {
struct l2cap_conn *conn = l2cap_pi(sk)->conn; struct l2cap_conn *conn = l2cap_pi(sk)->conn;
@@ -1202,8 +1212,7 @@ static void l2cap_monitor_timeout(unsigned long arg)
__mod_monitor_timer(); __mod_monitor_timer();
control = L2CAP_CTRL_POLL; control = L2CAP_CTRL_POLL;
control |= L2CAP_SUPER_RCV_READY; l2cap_send_rr_or_rnr(l2cap_pi(sk), control);
l2cap_send_sframe(l2cap_pi(sk), control);
bh_unlock_sock(sk); bh_unlock_sock(sk);
} }
@@ -1219,8 +1228,7 @@ static void l2cap_retrans_timeout(unsigned long arg)
l2cap_pi(sk)->conn_state |= L2CAP_CONN_WAIT_F; l2cap_pi(sk)->conn_state |= L2CAP_CONN_WAIT_F;
control = L2CAP_CTRL_POLL; control = L2CAP_CTRL_POLL;
control |= L2CAP_SUPER_RCV_READY; l2cap_send_rr_or_rnr(l2cap_pi(sk), control);
l2cap_send_sframe(l2cap_pi(sk), control);
bh_unlock_sock(sk); bh_unlock_sock(sk);
} }
@@ -3428,8 +3436,8 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str
del_timer(&l2cap_pi(sk)->retrans_timer); del_timer(&l2cap_pi(sk)->retrans_timer);
if (rx_control & L2CAP_CTRL_POLL) { if (rx_control & L2CAP_CTRL_POLL) {
u16 control = L2CAP_CTRL_FINAL | L2CAP_SUPER_RCV_READY; u16 control = L2CAP_CTRL_FINAL;
l2cap_send_sframe(l2cap_pi(sk), control); l2cap_send_rr_or_rnr(l2cap_pi(sk), control);
} }
break; break;
} }