diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2014-06-24 17:03:50 +0300 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2019-07-18 20:58:54 +0200 |
| commit | 8ea0780bcc5817751ff45b7db9c96b0c73437276 (patch) | |
| tree | cda220a0270e61c75c2aeb944a5b96da0ef39122 /net/bluetooth/l2cap_core.c | |
| parent | 09533de634cdd847ca5d87bf71f1345d861353bb (diff) | |
Bluetooth: Convert hci_conn->link_mode into flags
Since the link_mode member of the hci_conn struct is a bit field and we
already have a flags member as well it makes sense to merge these two
together. This patch moves all used link_mode bits into corresponding
flags. To keep backwards compatibility with user space we still need to
provide a get_link_mode() helper function for the ioctl's that expect a
link_mode style value.
Change-Id: Ia885bce68ab454ad47230a6a577e7ddd9319d73c
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 642487a01..c1cd33b74 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -5230,7 +5230,7 @@ static inline int l2cap_conn_param_update_req(struct l2cap_conn *conn, u16 min, max, latency, to_multiplier, cmd_len; int err; - if (!(hcon->link_mode & HCI_LM_MASTER)) + if (!test_bit(HCI_CONN_MASTER, &hcon->flags)) return -EINVAL; cmd_len = __le16_to_cpu(cmd->len); |