[PATCH v2] main: Remove unused main.conf option NameResolving

[PATCH v2] main: Remove unused main.conf option NameResolving

[Florian Pelz]

Commit 826023de5689 ("core: Create devices dynamically during
discovery") removed the last use of name_resolv.
---
 src/btd.h     | 1 -
 src/main.c    | 8 --------
 src/main.conf | 4 ----
 3 files changed, 13 deletions(-)

diff --git a/src/btd.h b/src/btd.h
index d13646889..c11076cce 100644
--- a/src/btd.h
+++ b/src/btd.h
@@ -109,7 +109,6 @@ struct btd_opts {
 	struct btd_defaults defaults;
 
 	gboolean	reverse_discovery;
-	gboolean	name_resolv;
 	gboolean	debug_keys;
 	gboolean	fast_conn;
 	gboolean	refresh_discovery;
diff --git a/src/main.c b/src/main.c
index a448320c1..52fa4829b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -766,13 +766,6 @@ static void parse_config(GKeyFile *config)
 	} else
 		btd_opts.reverse_discovery = boolean;
 
-	boolean = g_key_file_get_boolean(config, "General",
-						"NameResolving", &err);
-	if (err)
-		g_clear_error(&err);
-	else
-		btd_opts.name_resolv = boolean;
-
 	boolean = g_key_file_get_boolean(config, "General",
 						"DebugKeys", &err);
 	if (err)
@@ -954,7 +947,6 @@ static void init_defaults(void)
 	btd_opts.discovto = DEFAULT_DISCOVERABLE_TIMEOUT;
 	btd_opts.tmpto = DEFAULT_TEMPORARY_TIMEOUT;
 	btd_opts.reverse_discovery = TRUE;
-	btd_opts.name_resolv = TRUE;
 	btd_opts.debug_keys = FALSE;
 	btd_opts.refresh_discovery = TRUE;
 	btd_opts.name_request_retry_delay = DEFAULT_NAME_REQUEST_RETRY_DELAY;
diff --git a/src/main.conf b/src/main.conf
index 401796235..337dc77e5 100644
--- a/src/main.conf
+++ b/src/main.conf
@@ -37,10 +37,6 @@
 # Defaults to 'true'.
 #ReverseServiceDiscovery = true
 
-# Enable name resolving after inquiry. Set it to 'false' if you don't need
-# remote devices name and want shorter discovery cycle. Defaults to 'true'.
-#NameResolving = true
-
 # Enable runtime persistency of debug link keys. Default is false which
 # makes debug link keys valid only for the duration of the connection
 # that they were created for.

base-commit: 234d60423c3b8186a27b31028d4c0acb847eedb1
-- 
2.34.0

RE: [v2] main: Remove unused main.conf option NameResolving

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 1937 bytes --]

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=629501

---Test result---

Test Summary:
CheckPatch                    FAIL      1.50 seconds
GitLint                       PASS      1.01 seconds
Prep - Setup ELL              PASS      47.85 seconds
Build - Prep                  PASS      0.74 seconds
Build - Configure             PASS      9.70 seconds
Build - Make                  PASS      1374.25 seconds
Make Check                    PASS      11.87 seconds
Make Check w/Valgrind         PASS      462.56 seconds
Make Distcheck                PASS      243.13 seconds
Build w/ext ELL - Configure   PASS      8.86 seconds
Build w/ext ELL - Make        PASS      1328.73 seconds
Incremental Build with patchesPASS      0.00 seconds

Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
Output:
[v2] main: Remove unused main.conf option NameResolving
WARNING:UNKNOWN_COMMIT_ID: Unknown commit id '826023de5689', maybe rebased or not pulled?
#49: 
Commit 826023de5689 ("core: Create devices dynamically during

/github/workspace/src/12803348.patch total: 0 errors, 1 warnings, 37 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

/github/workspace/src/12803348.patch has style problems, please review.

NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO

NOTE: If any of the errors are false positives, please report
      them to the maintainer, see CHECKPATCH in MAINTAINERS.




---
Regards,
Linux Bluetooth

Re: [v2] main: Remove unused main.conf option NameResolving

[pelzflorian (Florian Pelz)]

On Wed, Apr 06, 2022 at 07:37:17AM -0700, bluez.test.bot@gmail.com wrote:
> WARNING:UNKNOWN_COMMIT_ID: Unknown commit id '826023de5689', maybe rebased or not pulled?
> #49: 
> Commit 826023de5689 ("core: Create devices dynamically during

This patch is for BlueZ, not Linux.

Re: [v2] main: Remove unused main.conf option NameResolving

[Luiz Augusto von Dentz]

Hi Florian,

On Wed, Apr 6, 2022 at 11:08 AM pelzflorian (Florian Pelz)
<pelzflorian@pelzflorian.de> wrote:
>
> On Wed, Apr 06, 2022 at 07:37:17AM -0700, bluez.test.bot@gmail.com wrote:
> > WARNING:UNKNOWN_COMMIT_ID: Unknown commit id '826023de5689', maybe rebased or not pulled?
> > #49:
> > Commit 826023de5689 ("core: Create devices dynamically during
>
> This patch is for BlueZ, not Linux.

You should prefix the patch with BlueZ, though the CI was able to
apply and test it and the above error is probably CI specific.
Regarding the use of the name resolving afaik we should make use of it
for legacy devices perhaps that was not taken into account when
changing the code lately but we should probably use it to make the
kernel skip asking for the device name.

-- 
Luiz Augusto von Dentz

Re: [v2] main: Remove unused main.conf option NameResolving

[pelzflorian (Florian Pelz)]

On Wed, Apr 06, 2022 at 04:27:03PM -0700, Luiz Augusto von Dentz wrote:
> Regarding the use of the name resolving afaik we should make use of it
> for legacy devices perhaps that was not taken into account when
> changing the code lately but we should probably use it to make the
> kernel skip asking for the device name.

OK thank you!  The commit that made NameResolving a no-op is ten years old
though; nobody seems to need it.

Regards,
Florian