Skip to content

L
linux
Commit e072745f authored by Gustavo F. Padovan's avatar Gustavo F. Padovan Committed by Marcel Holtmann
Browse files
Options

Bluetooth: Split l2cap_data_channel_sframe() 

Create a function for each type fo S-frame and avoid a lot of nested
code.
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: default avatarJoão Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 73edaa99
Hide whitespace changes
Inline Side-by-side
Showing with 115 additions and 89 deletions
net/bluetooth/l2cap.c
View file @ e072745f
...@@ -3475,120 +3475,146 @@ static inline int l2cap_data_channel_iframe(struct sock *sk, u16 rx_control, str ...@@ -3475,120 +3475,146 @@ static inline int l2cap_data_channel_iframe(struct sock *sk, u16 rx_control, str
return 0; return 0;
} }
static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, struct sk_buff *skb) static inline void l2cap_data_channel_rrframe(struct sock *sk, u16 rx_control)
{ {
struct l2cap_pinfo *pi = l2cap_pi(sk); struct l2cap_pinfo *pi = l2cap_pi(sk);
u8 tx_seq = __get_reqseq(rx_control); u8 tx_seq = __get_reqseq(rx_control);
BT_DBG("sk %p rx_control 0x%4.4x len %d", sk, rx_control, skb->len); if (rx_control & L2CAP_CTRL_POLL) {
l2cap_send_i_or_rr_or_rnr(sk);
if (L2CAP_CTRL_FINAL & rx_control) { pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
del_timer(&pi->monitor_timer);
if (pi->unacked_frames > 0)
__mod_retrans_timer();
pi->conn_state &= ~L2CAP_CONN_WAIT_F;
}
switch (rx_control & L2CAP_CTRL_SUPERVISE) { } else if (rx_control & L2CAP_CTRL_FINAL) {
case L2CAP_SUPER_RCV_READY: pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
if (rx_control & L2CAP_CTRL_POLL) { pi->expected_ack_seq = tx_seq;
l2cap_send_i_or_rr_or_rnr(sk); l2cap_drop_acked_frames(sk);
pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
} else if (rx_control & L2CAP_CTRL_FINAL) {
pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
pi->expected_ack_seq = tx_seq;
l2cap_drop_acked_frames(sk);
if (pi->conn_state & L2CAP_CONN_REJ_ACT)
pi->conn_state &= ~L2CAP_CONN_REJ_ACT;
else {
sk->sk_send_head = TX_QUEUE(sk)->next;
pi->next_tx_seq = pi->expected_ack_seq;
l2cap_ertm_send(sk);
}
} else { if (pi->conn_state & L2CAP_CONN_REJ_ACT)
pi->expected_ack_seq = tx_seq; pi->conn_state &= ~L2CAP_CONN_REJ_ACT;
l2cap_drop_acked_frames(sk); else {
sk->sk_send_head = TX_QUEUE(sk)->next;
pi->next_tx_seq = pi->expected_ack_seq;
l2cap_ertm_send(sk);
}
if ((pi->conn_state & L2CAP_CONN_REMOTE_BUSY) && } else {
(pi->unacked_frames > 0)) pi->expected_ack_seq = tx_seq;
__mod_retrans_timer(); l2cap_drop_acked_frames(sk);
pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY; if ((pi->conn_state & L2CAP_CONN_REMOTE_BUSY) &&
if (pi->conn_state & L2CAP_CONN_SREJ_SENT) (pi->unacked_frames > 0))
l2cap_send_ack(pi); __mod_retrans_timer();
else
l2cap_ertm_send(sk);
}
break;
case L2CAP_SUPER_REJECT:
pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY; pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
if (pi->conn_state & L2CAP_CONN_SREJ_SENT)
l2cap_send_ack(pi);
else
l2cap_ertm_send(sk);
}
}
pi->expected_ack_seq = __get_reqseq(rx_control); static inline void l2cap_data_channel_rejframe(struct sock *sk, u16 rx_control)
l2cap_drop_acked_frames(sk); {
struct l2cap_pinfo *pi = l2cap_pi(sk);
u8 tx_seq = __get_reqseq(rx_control);
if (rx_control & L2CAP_CTRL_FINAL) { pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
if (pi->conn_state & L2CAP_CONN_REJ_ACT)
pi->conn_state &= ~L2CAP_CONN_REJ_ACT; pi->expected_ack_seq = __get_reqseq(rx_control);
else { l2cap_drop_acked_frames(sk);
sk->sk_send_head = TX_QUEUE(sk)->next;
pi->next_tx_seq = pi->expected_ack_seq; if (rx_control & L2CAP_CTRL_FINAL) {
l2cap_ertm_send(sk); if (pi->conn_state & L2CAP_CONN_REJ_ACT)
} pi->conn_state &= ~L2CAP_CONN_REJ_ACT;
} else { else {
sk->sk_send_head = TX_QUEUE(sk)->next; sk->sk_send_head = TX_QUEUE(sk)->next;
pi->next_tx_seq = pi->expected_ack_seq; pi->next_tx_seq = pi->expected_ack_seq;
l2cap_ertm_send(sk); l2cap_ertm_send(sk);
if (pi->conn_state & L2CAP_CONN_WAIT_F) {
pi->srej_save_reqseq = tx_seq;
pi->conn_state |= L2CAP_CONN_REJ_ACT;
}
} }
} else {
sk->sk_send_head = TX_QUEUE(sk)->next;
pi->next_tx_seq = pi->expected_ack_seq;
l2cap_ertm_send(sk);
break; if (pi->conn_state & L2CAP_CONN_WAIT_F) {
pi->srej_save_reqseq = tx_seq;
pi->conn_state |= L2CAP_CONN_REJ_ACT;
}
}
}
static inline void l2cap_data_channel_srejframe(struct sock *sk, u16 rx_control)
{
struct l2cap_pinfo *pi = l2cap_pi(sk);
u8 tx_seq = __get_reqseq(rx_control);
case L2CAP_SUPER_SELECT_REJECT: pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
if (rx_control & L2CAP_CTRL_POLL) { if (rx_control & L2CAP_CTRL_POLL) {
pi->expected_ack_seq = tx_seq; pi->expected_ack_seq = tx_seq;
l2cap_drop_acked_frames(sk); l2cap_drop_acked_frames(sk);
l2cap_retransmit_frame(sk, tx_seq); l2cap_retransmit_frame(sk, tx_seq);
l2cap_ertm_send(sk); l2cap_ertm_send(sk);
if (pi->conn_state & L2CAP_CONN_WAIT_F) { if (pi->conn_state & L2CAP_CONN_WAIT_F) {
pi->srej_save_reqseq = tx_seq; pi->srej_save_reqseq = tx_seq;
pi->conn_state |= L2CAP_CONN_SREJ_ACT; pi->conn_state |= L2CAP_CONN_SREJ_ACT;
}
} else if (rx_control & L2CAP_CTRL_FINAL) {
if ((pi->conn_state & L2CAP_CONN_SREJ_ACT) &&
pi->srej_save_reqseq == tx_seq)
pi->conn_state &= ~L2CAP_CONN_SREJ_ACT;
else
l2cap_retransmit_frame(sk, tx_seq);
} }
else { } else if (rx_control & L2CAP_CTRL_FINAL) {
if ((pi->conn_state & L2CAP_CONN_SREJ_ACT) &&
pi->srej_save_reqseq == tx_seq)
pi->conn_state &= ~L2CAP_CONN_SREJ_ACT;
else
l2cap_retransmit_frame(sk, tx_seq); l2cap_retransmit_frame(sk, tx_seq);
if (pi->conn_state & L2CAP_CONN_WAIT_F) { } else {
pi->srej_save_reqseq = tx_seq; l2cap_retransmit_frame(sk, tx_seq);
pi->conn_state |= L2CAP_CONN_SREJ_ACT; if (pi->conn_state & L2CAP_CONN_WAIT_F) {
} pi->srej_save_reqseq = tx_seq;
pi->conn_state |= L2CAP_CONN_SREJ_ACT;
} }
}
}
static inline void l2cap_data_channel_rnrframe(struct sock *sk, u16 rx_control)
{
struct l2cap_pinfo *pi = l2cap_pi(sk);
u8 tx_seq = __get_reqseq(rx_control);
pi->conn_state |= L2CAP_CONN_REMOTE_BUSY;
pi->expected_ack_seq = tx_seq;
l2cap_drop_acked_frames(sk);
del_timer(&pi->retrans_timer);
if (rx_control & L2CAP_CTRL_POLL) {
u16 control = L2CAP_CTRL_FINAL;
l2cap_send_rr_or_rnr(pi, control);
}
}
static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, struct sk_buff *skb)
{
BT_DBG("sk %p rx_control 0x%4.4x len %d", sk, rx_control, skb->len);
if (L2CAP_CTRL_FINAL & rx_control) {
del_timer(&l2cap_pi(sk)->monitor_timer);
if (l2cap_pi(sk)->unacked_frames > 0)
__mod_retrans_timer();
l2cap_pi(sk)->conn_state &= ~L2CAP_CONN_WAIT_F;
}
switch (rx_control & L2CAP_CTRL_SUPERVISE) {
case L2CAP_SUPER_RCV_READY:
l2cap_data_channel_rrframe(sk, rx_control);
break; break;
case L2CAP_SUPER_RCV_NOT_READY: case L2CAP_SUPER_REJECT:
pi->conn_state |= L2CAP_CONN_REMOTE_BUSY; l2cap_data_channel_rejframe(sk, rx_control);
pi->expected_ack_seq = tx_seq; break;
l2cap_drop_acked_frames(sk);
del_timer(&pi->retrans_timer); case L2CAP_SUPER_SELECT_REJECT:
if (rx_control & L2CAP_CTRL_POLL) { l2cap_data_channel_srejframe(sk, rx_control);
u16 control = L2CAP_CTRL_FINAL; break;
l2cap_send_rr_or_rnr(pi, control);
} case L2CAP_SUPER_RCV_NOT_READY:
l2cap_data_channel_rnrframe(sk, rx_control);
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7