Bluetooth: Track both local and remote L2CAP fixed channel mask
authorJohan Hedberg <johan.hedberg@intel.com>
Tue, 2 Dec 2014 08:09:26 +0000 (10:09 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Tue, 2 Dec 2014 08:26:50 +0000 (09:26 +0100)
commit0bd49fc75aab94a7bf3cd2f7c70e03b600635c65
tree54ed21b90f1c0921ff545fd9e4259cbcad4a09c6
parentf6af675ef5489c69fc3d4faf8c6f477df3cbf8b9
Bluetooth: Track both local and remote L2CAP fixed channel mask

To pave the way for future fixed channels to be added easily we should
track both the local and remote mask on a per-L2CAP connection (struct
l2cap_conn) basis. So far the code has used a global variable in a racy
way which anyway needs fixing.

This patch renames the existing conn->fixed_chan_mask that tracked
the remote mask to conn->remote_fixed_chan and adds a new variable
conn->local_fixed_chan to track the local mask. Since the HS support
info is now available in the local mask we can remove the
conn->hs_enabled variable.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
include/net/bluetooth/l2cap.h
net/bluetooth/l2cap_core.c