diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-12 17:31:57 -0400 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-04-27 17:51:35 -0400 |
commit | 4343478f3a4806394136d8141b2e451aa5443f03 (patch) | |
tree | 3f8b367bf650dee21c848da206e1c06c36ec1b97 /include/net/bluetooth | |
parent | 77a74c7e0861e6ebac7effe233fd7e83f1ad9ecc (diff) |
Bluetooth: Move some more elements to struct l2cap_chan
In this commit sec_level, force_reliable, role_switch and flushable.
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'include/net/bluetooth')
-rw-r--r-- | include/net/bluetooth/l2cap.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index f7093500034..684deee6ec5 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h | |||
@@ -284,6 +284,12 @@ struct srej_list { | |||
284 | 284 | ||
285 | struct l2cap_chan { | 285 | struct l2cap_chan { |
286 | struct sock *sk; | 286 | struct sock *sk; |
287 | |||
288 | __u8 sec_level; | ||
289 | __u8 role_switch; | ||
290 | __u8 force_reliable; | ||
291 | __u8 flushable; | ||
292 | |||
287 | __u8 ident; | 293 | __u8 ident; |
288 | 294 | ||
289 | __u8 conf_req[64]; | 295 | __u8 conf_req[64]; |
@@ -371,10 +377,6 @@ struct l2cap_pinfo { | |||
371 | __u8 mode; | 377 | __u8 mode; |
372 | 378 | ||
373 | __u8 fcs; | 379 | __u8 fcs; |
374 | __u8 sec_level; | ||
375 | __u8 role_switch; | ||
376 | __u8 force_reliable; | ||
377 | __u8 flushable; | ||
378 | 380 | ||
379 | __u8 tx_win; | 381 | __u8 tx_win; |
380 | __u8 max_tx; | 382 | __u8 max_tx; |
@@ -452,7 +454,7 @@ struct sk_buff *l2cap_create_connless_pdu(struct sock *sk, struct msghdr *msg, s | |||
452 | struct sk_buff *l2cap_create_basic_pdu(struct sock *sk, struct msghdr *msg, size_t len); | 454 | struct sk_buff *l2cap_create_basic_pdu(struct sock *sk, struct msghdr *msg, size_t len); |
453 | struct sk_buff *l2cap_create_iframe_pdu(struct sock *sk, struct msghdr *msg, size_t len, u16 control, u16 sdulen); | 455 | struct sk_buff *l2cap_create_iframe_pdu(struct sock *sk, struct msghdr *msg, size_t len, u16 control, u16 sdulen); |
454 | int l2cap_sar_segment_sdu(struct l2cap_chan *chan, struct msghdr *msg, size_t len); | 456 | int l2cap_sar_segment_sdu(struct l2cap_chan *chan, struct msghdr *msg, size_t len); |
455 | void l2cap_do_send(struct sock *sk, struct sk_buff *skb); | 457 | void l2cap_do_send(struct l2cap_chan *chan, struct sk_buff *skb); |
456 | void l2cap_streaming_send(struct l2cap_chan *chan); | 458 | void l2cap_streaming_send(struct l2cap_chan *chan); |
457 | int l2cap_ertm_send(struct l2cap_chan *chan); | 459 | int l2cap_ertm_send(struct l2cap_chan *chan); |
458 | 460 | ||