aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-04-12 17:15:09 -0400
committerGustavo F. Padovan <padovan@profusion.mobi>2011-04-27 17:51:34 -0400
commitb44500351845e4f6df0d752a8870da246be8216f (patch)
tree3f0faf668af01c72c408be1eea043c73bff2c0b9 /include
parent5d41ce1dd91bce01d50aff79786dc5d5eedcfab7 (diff)
Bluetooth: Move conf_state to struct l2cap_chan
First move of elements depending on user data. Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'include')
-rw-r--r--include/net/bluetooth/l2cap.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 537e3c16339f..b3bb3d492fff 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -291,6 +291,7 @@ struct l2cap_chan {
291 __u8 num_conf_req; 291 __u8 num_conf_req;
292 __u8 num_conf_rsp; 292 __u8 num_conf_rsp;
293 293
294 __u8 conf_state;
294 __u16 conn_state; 295 __u16 conn_state;
295 296
296 __u8 next_tx_seq; 297 __u8 next_tx_seq;
@@ -375,8 +376,6 @@ struct l2cap_pinfo {
375 __u8 force_reliable; 376 __u8 force_reliable;
376 __u8 flushable; 377 __u8 flushable;
377 378
378 __u8 conf_state;
379
380 __u8 tx_win; 379 __u8 tx_win;
381 __u8 max_tx; 380 __u8 max_tx;
382 __u16 retrans_timeout; 381 __u16 retrans_timeout;