diff options
-rw-r--r-- | include/net/bluetooth/l2cap.h | 5 | ||||
-rw-r--r-- | net/bluetooth/l2cap_core.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index e0c6a9abdb62..d8e7b9330ab8 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h | |||
@@ -134,9 +134,12 @@ struct l2cap_conninfo { | |||
134 | #define L2CAP_FCS_CRC16 0x01 | 134 | #define L2CAP_FCS_CRC16 0x01 |
135 | 135 | ||
136 | /* L2CAP fixed channels */ | 136 | /* L2CAP fixed channels */ |
137 | #define L2CAP_FC_L2CAP 0x02 | 137 | #define L2CAP_FC_SIG_BREDR 0x02 |
138 | #define L2CAP_FC_CONNLESS 0x04 | 138 | #define L2CAP_FC_CONNLESS 0x04 |
139 | #define L2CAP_FC_A2MP 0x08 | 139 | #define L2CAP_FC_A2MP 0x08 |
140 | #define L2CAP_FC_ATT 0x10 | ||
141 | #define L2CAP_FC_SIG_LE 0x20 | ||
142 | #define L2CAP_FC_SMP_LE 0x40 | ||
140 | 143 | ||
141 | /* L2CAP Control Field bit masks */ | 144 | /* L2CAP Control Field bit masks */ |
142 | #define L2CAP_CTRL_SAR 0xC000 | 145 | #define L2CAP_CTRL_SAR 0xC000 |
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 8680aae678ce..0c3c4935f635 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c | |||
@@ -46,7 +46,7 @@ | |||
46 | bool disable_ertm; | 46 | bool disable_ertm; |
47 | 47 | ||
48 | static u32 l2cap_feat_mask = L2CAP_FEAT_FIXED_CHAN | L2CAP_FEAT_UCD; | 48 | static u32 l2cap_feat_mask = L2CAP_FEAT_FIXED_CHAN | L2CAP_FEAT_UCD; |
49 | static u8 l2cap_fixed_chan[8] = { L2CAP_FC_L2CAP | L2CAP_FC_CONNLESS, }; | 49 | static u8 l2cap_fixed_chan[8] = { L2CAP_FC_SIG_BREDR | L2CAP_FC_CONNLESS, }; |
50 | 50 | ||
51 | static LIST_HEAD(chan_list); | 51 | static LIST_HEAD(chan_list); |
52 | static DEFINE_RWLOCK(chan_list_lock); | 52 | static DEFINE_RWLOCK(chan_list_lock); |