diff options
author | Johan Hedberg <johan.hedberg@intel.com> | 2014-07-16 04:42:27 -0400 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-07-16 05:04:23 -0400 |
commit | 40bef302f6323d1ee6fb3dc0e62edb0f446d0339 (patch) | |
tree | 2b77646a8adf90560b66e7f72df64ab4cc76240e /include/net/bluetooth | |
parent | ba165a90b59812ab1d9cd2943fd104cfc25c601e (diff) |
Bluetooth: Convert HCI_CONN_MASTER flag to a conn->role variable
Having a dedicated u8 role variable in the hci_conn struct greatly
simplifies tracking of the role, since this is the native way that it's
represented on the HCI level.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'include/net/bluetooth')
-rw-r--r-- | include/net/bluetooth/hci_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index b52c2ef3f56d..e335c5fd8824 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h | |||
@@ -371,6 +371,7 @@ struct hci_conn { | |||
371 | __u16 state; | 371 | __u16 state; |
372 | __u8 mode; | 372 | __u8 mode; |
373 | __u8 type; | 373 | __u8 type; |
374 | __u8 role; | ||
374 | bool out; | 375 | bool out; |
375 | __u8 attempt; | 376 | __u8 attempt; |
376 | __u8 dev_class[3]; | 377 | __u8 dev_class[3]; |
@@ -540,7 +541,6 @@ enum { | |||
540 | HCI_CONN_POWER_SAVE, | 541 | HCI_CONN_POWER_SAVE, |
541 | HCI_CONN_REMOTE_OOB, | 542 | HCI_CONN_REMOTE_OOB, |
542 | HCI_CONN_FLUSH_KEY, | 543 | HCI_CONN_FLUSH_KEY, |
543 | HCI_CONN_MASTER, | ||
544 | HCI_CONN_ENCRYPT, | 544 | HCI_CONN_ENCRYPT, |
545 | HCI_CONN_AUTH, | 545 | HCI_CONN_AUTH, |
546 | HCI_CONN_SECURE, | 546 | HCI_CONN_SECURE, |