Return-Path: MIME-Version: 1.0 Date: Thu, 16 Sep 2010 17:21:40 +0800 Message-ID: Subject: [PATCH] Bluetooth: Replace hard code of configuration continuation flag. From: haijun liu To: linux-bluetooth@vger.kernel.org, Mat Martineau , "dantian.ip" Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-bluetooth-owner@vger.kernel.org List-ID: Replace hard code of configuration continuation flag with self-comment macro. Signed-off-by: Haijun.Liu --- include/net/bluetooth/l2cap.h | 2 ++ net/bluetooth/l2cap.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h index e4fe2c7..a37b266 100644 --- a/include/net/bluetooth/l2cap.h +++ b/include/net/bluetooth/l2cap.h @@ -199,6 +199,8 @@ struct l2cap_conf_rsp { #define L2CAP_CONF_REJECT 0x0002 #define L2CAP_CONF_UNKNOWN 0x0003 +#define L2CAP_CONF_FLAG_CONT 0x0001 + struct l2cap_conf_opt { __u8 type; __u8 len; diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 1797277..725744b 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -3121,7 +3121,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr memcpy(l2cap_pi(sk)->conf_req + l2cap_pi(sk)->conf_len, req->data, len); l2cap_pi(sk)->conf_len += len; - if (flags & 0x0001) { + if (flags & L2CAP_CONF_FLAG_CONT) { /* Incomplete config. Send empty response. */ l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP, l2cap_build_conf_rsp(sk, rsp, @@ -3228,7 +3228,7 @@ static inline int l2cap_config_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr goto done; } - if (flags & 0x01) + if (flags & L2CAP_CONF_FLAG_CONT) goto done; l2cap_pi(sk)->conf_state |= L2CAP_CONF_INPUT_DONE; -- 1.6.3.3 -- Haijun Liu