diff options
| author | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2020-10-28 14:50:00 -0700 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2020-10-29 10:27:37 -0700 |
| commit | 01d035d33886b13cd6dc361f994ce22ad47daf61 (patch) | |
| tree | fed6bff733a16c81499125502066177daa13f980 /src/gatt-client.c | |
| parent | 8c6373667aebae94722eb1960434231528b51f3f (diff) | |
| download | bluez-01d035d33886b13cd6dc361f994ce22ad47daf61.tar.gz | |
core: Rename main_opts to btd_opts
Use btd_ prefix since this is a daemon API.
Diffstat (limited to 'src/gatt-client.c')
| -rw-r--r-- | src/gatt-client.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gatt-client.c b/src/gatt-client.c index 38b0b5170..7fbf0093b 100644 --- a/src/gatt-client.c +++ b/src/gatt-client.c @@ -2174,13 +2174,13 @@ static void eatt_connect(struct btd_gatt_client *client) char addr[18]; int i; - if (bt_att_get_channels(att) == main_opts.gatt_channels) + if (bt_att_get_channels(att) == btd_opts.gatt_channels) return; ba2str(device_get_address(dev), addr); - for (i = bt_att_get_channels(att); i < main_opts.gatt_channels; i++) { - int defer_timeout = i + 1 < main_opts.gatt_channels ? 1 : 0; + for (i = bt_att_get_channels(att); i < btd_opts.gatt_channels; i++) { + int defer_timeout = i + 1 < btd_opts.gatt_channels ? 1 : 0; DBG("Connection attempt to: %s defer %s", addr, defer_timeout ? "true" : "false"); @@ -2198,7 +2198,7 @@ static void eatt_connect(struct btd_gatt_client *client) BT_IO_OPT_MODE, BT_IO_MODE_EXT_FLOWCTL, BT_IO_OPT_PSM, BT_ATT_EATT_PSM, BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW, - BT_IO_OPT_MTU, main_opts.gatt_mtu, + BT_IO_OPT_MTU, btd_opts.gatt_mtu, BT_IO_OPT_DEFER_TIMEOUT, defer_timeout, BT_IO_OPT_INVALID); if (!io) { @@ -2216,7 +2216,7 @@ static void eatt_connect(struct btd_gatt_client *client) device_get_le_address_type(dev), BT_IO_OPT_PSM, BT_ATT_EATT_PSM, BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_LOW, - BT_IO_OPT_MTU, main_opts.gatt_mtu, + BT_IO_OPT_MTU, btd_opts.gatt_mtu, BT_IO_OPT_INVALID); if (!io) { error("EATT bt_io_connect(%s): %s", addr, |