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

Bluetooth: Split l2cap_data_channel_sframe()

Browse Source 
Create a function for each type fo S-frame and avoid a lot of nested
code.

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>
This commit is contained in:
Gustavo F. Padovan
2010-05-01 16:15:38 -03:00
committed by Marcel Holtmann
parent 73edaa9933
commit e072745f4a
1 changed files with 119 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
net/bluetooth/l2cap.c
View File

@@ -3475,22 +3475,11 @@ expected:
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 (L2CAP_CTRL_FINAL & rx_control) {
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) {
case L2CAP_SUPER_RCV_READY:
if (rx_control & L2CAP_CTRL_POLL) { if (rx_control & L2CAP_CTRL_POLL) {
l2cap_send_i_or_rr_or_rnr(sk); l2cap_send_i_or_rr_or_rnr(sk);
pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY; pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
@@ -3522,9 +3511,13 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str
else else
l2cap_ertm_send(sk); l2cap_ertm_send(sk);
} }
break; }
static inline void l2cap_data_channel_rejframe(struct sock *sk, u16 rx_control)
{
struct l2cap_pinfo *pi = l2cap_pi(sk);
u8 tx_seq = __get_reqseq(rx_control);
case L2CAP_SUPER_REJECT:
pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY; pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;
pi->expected_ack_seq = __get_reqseq(rx_control); pi->expected_ack_seq = __get_reqseq(rx_control);
@@ -3548,10 +3541,12 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str
pi->conn_state |= L2CAP_CONN_REJ_ACT; 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);
break;
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) {
@@ -3569,17 +3564,20 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str
pi->conn_state &= ~L2CAP_CONN_SREJ_ACT; pi->conn_state &= ~L2CAP_CONN_SREJ_ACT;
else else
l2cap_retransmit_frame(sk, tx_seq); l2cap_retransmit_frame(sk, tx_seq);
} } else {
else {
l2cap_retransmit_frame(sk, tx_seq); l2cap_retransmit_frame(sk, tx_seq);
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;
} }
} }
break; }
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);
case L2CAP_SUPER_RCV_NOT_READY:
pi->conn_state |= L2CAP_CONN_REMOTE_BUSY; pi->conn_state |= L2CAP_CONN_REMOTE_BUSY;
pi->expected_ack_seq = tx_seq; pi->expected_ack_seq = tx_seq;
l2cap_drop_acked_frames(sk); l2cap_drop_acked_frames(sk);
@@ -3589,6 +3587,34 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str
u16 control = L2CAP_CTRL_FINAL; u16 control = L2CAP_CTRL_FINAL;
l2cap_send_rr_or_rnr(pi, control); 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;
case L2CAP_SUPER_REJECT:
l2cap_data_channel_rejframe(sk, rx_control);
break;
case L2CAP_SUPER_SELECT_REJECT:
l2cap_data_channel_srejframe(sk, rx_control);
break;
case L2CAP_SUPER_RCV_NOT_READY:
l2cap_data_channel_rnrframe(sk, rx_control);
break; break;
} }