diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/l2cap.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index a1c7ae88dd1f..c12eccfdfe01 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
@@ -57,7 +57,7 @@ | |||
57 | 57 | ||
58 | #define VERSION "2.15" | 58 | #define VERSION "2.15" |
59 | 59 | ||
60 | static int disable_ertm = 0; | 60 | static int disable_ertm; |
61 | 61 | ||
62 | static u32 l2cap_feat_mask = L2CAP_FEAT_FIXED_CHAN; | 62 | static u32 l2cap_feat_mask = L2CAP_FEAT_FIXED_CHAN; |
63 | static u8 l2cap_fixed_chan[8] = { 0x02, }; | 63 | static u8 l2cap_fixed_chan[8] = { 0x02, }; |
@@ -4162,11 +4162,10 @@ static inline void l2cap_data_channel_rrframe(struct sock *sk, u16 rx_control) | |||
4162 | __mod_retrans_timer(); | 4162 | __mod_retrans_timer(); |
4163 | 4163 | ||
4164 | pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY; | 4164 | pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY; |
4165 | if (pi->conn_state & L2CAP_CONN_SREJ_SENT) { | 4165 | if (pi->conn_state & L2CAP_CONN_SREJ_SENT) |
4166 | l2cap_send_ack(pi); | 4166 | l2cap_send_ack(pi); |
4167 | } else { | 4167 | else |
4168 | l2cap_ertm_send(sk); | 4168 | l2cap_ertm_send(sk); |
4169 | } | ||
4170 | } | 4169 | } |
4171 | } | 4170 | } |
4172 | 4171 | ||