aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo F. Padovan <gustavo@las.ic.unicamp.br>2009-04-20 00:31:07 -0400
committerMarcel Holtmann <marcel@holtmann.org>2009-06-08 08:50:00 -0400
commit589d27464846c7cb758f93d9ee380c8ff05a161c (patch)
treecca78e805ba371fb53043ff9f0ceed5c02c25184
parent8db4dc46dcff7568896aa1eae4bd07620ce3dd93 (diff)
Bluetooth: Use macro for L2CAP hint mask on receiving config request
Using the L2CAP_CONF_HINT macro is easier to understand than using a hardcoded 0x80 value. Signed-off-by: Gustavo F. Padovan <gustavo@las.ic.unicamp.br> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--include/net/bluetooth/l2cap.h2
-rw-r--r--net/bluetooth/l2cap.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index ed4ba913d94c..300b63f0eec9 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -149,6 +149,8 @@ struct l2cap_conf_opt {
149} __attribute__ ((packed)); 149} __attribute__ ((packed));
150#define L2CAP_CONF_OPT_SIZE 2 150#define L2CAP_CONF_OPT_SIZE 2
151 151
152#define L2CAP_CONF_HINT 0x80
153
152#define L2CAP_CONF_MTU 0x01 154#define L2CAP_CONF_MTU 0x01
153#define L2CAP_CONF_FLUSH_TO 0x02 155#define L2CAP_CONF_FLUSH_TO 0x02
154#define L2CAP_CONF_QOS 0x03 156#define L2CAP_CONF_QOS 0x03
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index ff1744e34cd8..c0c091533bd0 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -1739,7 +1739,7 @@ static int l2cap_parse_conf_req(struct sock *sk, void *data)
1739 while (len >= L2CAP_CONF_OPT_SIZE) { 1739 while (len >= L2CAP_CONF_OPT_SIZE) {
1740 len -= l2cap_get_conf_opt(&req, &type, &olen, &val); 1740 len -= l2cap_get_conf_opt(&req, &type, &olen, &val);
1741 1741
1742 hint = type & 0x80; 1742 hint = type & L2CAP_CONF_HINT;
1743 type &= 0x7f; 1743 type &= 0x7f;
1744 1744
1745 switch (type) { 1745 switch (type) {