diff options
| author | Andrei Emeltchenko | 2012-05-23 10:31:22 +0200 |
|---|---|---|
| committer | Johan Hedberg | 2012-06-05 05:34:07 +0200 |
| commit | 5325e5bb86f6dd2977f0891b9eaff57293538d50 (patch) | |
| tree | 7d8bb3206d51d282f771b1c66dfdfe81fb6b4554 /net | |
| parent | Bluetooth: Use defined link key size (diff) | |
| download | kernel-qcow2-linux-5325e5bb86f6dd2977f0891b9eaff57293538d50.tar.gz kernel-qcow2-linux-5325e5bb86f6dd2977f0891b9eaff57293538d50.tar.xz kernel-qcow2-linux-5325e5bb86f6dd2977f0891b9eaff57293538d50.zip | |
Bluetooth: Preserve L2CAP flags values
Previous callers of l2cap_build_conf_rsp in l2cap_config_req use
flags instead of continuation flag hardcoded value. It does not change
logic and preserve future possible flags.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index b644f4085f49..db76a7750ee6 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -3641,7 +3641,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr /* Incomplete config. Send empty response. */ l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP, l2cap_build_conf_rsp(chan, rsp, - L2CAP_CONF_SUCCESS, 0x0001), rsp); + L2CAP_CONF_SUCCESS, flags), rsp); goto unlock; } @@ -3697,7 +3697,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP, l2cap_build_conf_rsp(chan, rsp, - L2CAP_CONF_SUCCESS, 0x0000), rsp); + L2CAP_CONF_SUCCESS, flags), rsp); } unlock: |