diff options
author | Marcel Holtmann <marcel@holtmann.org> | 2009-05-02 21:57:55 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2009-06-08 08:50:00 -0400 |
commit | 47ec1dcd696d56a7c396e5838516a566ecd4b03d (patch) | |
tree | bd730bf14a5f685c8fad4f84fe0aa434a960f06c /net/bluetooth | |
parent | af05b30bcb65da3ed488af54ee92e96bebe0be5e (diff) |
Bluetooth: Add basic constants for L2CAP ERTM support and use them
This adds the basic constants required to add support for L2CAP Enhanced
Retransmission feature.
Based on a patch from Nathan Holstein <nathan@lampreynetworks.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r-- | net/bluetooth/l2cap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index f6a82f203fd2..338295007c4b 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c | |||
@@ -52,7 +52,7 @@ | |||
52 | 52 | ||
53 | #define VERSION "2.13" | 53 | #define VERSION "2.13" |
54 | 54 | ||
55 | static u32 l2cap_feat_mask = 0x0080; | 55 | static u32 l2cap_feat_mask = L2CAP_FEAT_FIXED_CHAN; |
56 | static u8 l2cap_fixed_chan[8] = { 0x02, }; | 56 | static u8 l2cap_fixed_chan[8] = { 0x02, }; |
57 | 57 | ||
58 | static const struct proto_ops l2cap_sock_ops; | 58 | static const struct proto_ops l2cap_sock_ops; |
@@ -1747,7 +1747,7 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data) | |||
1747 | len -= l2cap_get_conf_opt(&req, &type, &olen, &val); | 1747 | len -= l2cap_get_conf_opt(&req, &type, &olen, &val); |
1748 | 1748 | ||
1749 | hint = type & L2CAP_CONF_HINT; | 1749 | hint = type & L2CAP_CONF_HINT; |
1750 | type &= 0x7f; | 1750 | type &= L2CAP_CONF_MASK; |
1751 | 1751 | ||
1752 | switch (type) { | 1752 | switch (type) { |
1753 | case L2CAP_CONF_MTU: | 1753 | case L2CAP_CONF_MTU: |
@@ -2244,7 +2244,7 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn, struct l2cap_cm | |||
2244 | if (type == L2CAP_IT_FEAT_MASK) { | 2244 | if (type == L2CAP_IT_FEAT_MASK) { |
2245 | conn->feat_mask = get_unaligned_le32(rsp->data); | 2245 | conn->feat_mask = get_unaligned_le32(rsp->data); |
2246 | 2246 | ||
2247 | if (conn->feat_mask & 0x0080) { | 2247 | if (conn->feat_mask & L2CAP_FEAT_FIXED_CHAN) { |
2248 | struct l2cap_info_req req; | 2248 | struct l2cap_info_req req; |
2249 | req.type = cpu_to_le16(L2CAP_IT_FIXED_CHAN); | 2249 | req.type = cpu_to_le16(L2CAP_IT_FIXED_CHAN); |
2250 | 2250 | ||