summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorGustavo F. Padovan <padovan@profusion.mobi>2011-04-12 18:15:09 -0300
committerGustavo F. Padovan <padovan@profusion.mobi>2011-04-27 18:51:34 -0300
commitb44500351845e4f6df0d752a8870da246be8216f (patch)
tree3f0faf668af01c72c408be1eea043c73bff2c0b9 /include/net
parent5d41ce1dd91bce01d50aff79786dc5d5eedcfab7 (diff)
downloadlinux-b44500351845e4f6df0d752a8870da246be8216f.tar.bz2
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/net')
-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 {
__u8 num_conf_req;
__u8 num_conf_rsp;
+ __u8 conf_state;
__u16 conn_state;
__u8 next_tx_seq;
@@ -375,8 +376,6 @@ struct l2cap_pinfo {
__u8 force_reliable;
__u8 flushable;
- __u8 conf_state;
-
__u8 tx_win;
__u8 max_tx;
__u16 retrans_timeout;