diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/net/bluetooth/l2cap.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index 469241353d78..82d5b81a779b 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h | |||
@@ -286,6 +286,8 @@ struct l2cap_chan { | |||
286 | __u8 num_conf_req; | 286 | __u8 num_conf_req; |
287 | __u8 num_conf_rsp; | 287 | __u8 num_conf_rsp; |
288 | 288 | ||
289 | __u16 conn_state; | ||
290 | |||
289 | struct list_head list; | 291 | struct list_head list; |
290 | }; | 292 | }; |
291 | 293 | ||
@@ -350,7 +352,6 @@ struct l2cap_pinfo { | |||
350 | __u8 flushable; | 352 | __u8 flushable; |
351 | 353 | ||
352 | __u8 conf_state; | 354 | __u8 conf_state; |
353 | __u16 conn_state; | ||
354 | 355 | ||
355 | __u8 next_tx_seq; | 356 | __u8 next_tx_seq; |
356 | __u8 expected_ack_seq; | 357 | __u8 expected_ack_seq; |
@@ -456,7 +457,7 @@ struct sk_buff *l2cap_create_iframe_pdu(struct sock *sk, struct msghdr *msg, siz | |||
456 | int l2cap_sar_segment_sdu(struct sock *sk, struct msghdr *msg, size_t len); | 457 | int l2cap_sar_segment_sdu(struct sock *sk, struct msghdr *msg, size_t len); |
457 | void l2cap_do_send(struct sock *sk, struct sk_buff *skb); | 458 | void l2cap_do_send(struct sock *sk, struct sk_buff *skb); |
458 | void l2cap_streaming_send(struct sock *sk); | 459 | void l2cap_streaming_send(struct sock *sk); |
459 | int l2cap_ertm_send(struct sock *sk); | 460 | int l2cap_ertm_send(struct l2cap_chan *chan); |
460 | 461 | ||
461 | void l2cap_sock_set_timer(struct sock *sk, long timeout); | 462 | void l2cap_sock_set_timer(struct sock *sk, long timeout); |
462 | void l2cap_sock_clear_timer(struct sock *sk); | 463 | void l2cap_sock_clear_timer(struct sock *sk); |