[PATCH net-next] net: ipconfig: Remove outdated comment and indent code block

[PATCH net-next] net: ipconfig: Remove outdated comment and indent code block

[Thorsten Blum]

The comment has been around ever since commit 1da177e4c3f4
("Linux-2.6.12-rc2") and can be removed. Remove it and indent the code
block accordingly.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 net/ipv4/ipconfig.c | 87 ++++++++++++++++++++++-----------------------
 1 file changed, 42 insertions(+), 45 deletions(-)

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 019408d3ca2c..d577ef580f8c 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -705,51 +705,48 @@ ic_dhcp_init_options(u8 *options, struct ic_device *d)
 		e += 4;
 	}
 
-	/* always? */
-	{
-		static const u8 ic_req_params[] = {
-			1,	/* Subnet mask */
-			3,	/* Default gateway */
-			6,	/* DNS server */
-			12,	/* Host name */
-			15,	/* Domain name */
-			17,	/* Boot path */
-			26,	/* MTU */
-			40,	/* NIS domain name */
-			42,	/* NTP servers */
-		};
-
-		*e++ = 55;	/* Parameter request list */
-		*e++ = sizeof(ic_req_params);
-		memcpy(e, ic_req_params, sizeof(ic_req_params));
-		e += sizeof(ic_req_params);
-
-		if (ic_host_name_set) {
-			*e++ = 12;	/* host-name */
-			len = strlen(utsname()->nodename);
-			*e++ = len;
-			memcpy(e, utsname()->nodename, len);
-			e += len;
-		}
-		if (*vendor_class_identifier) {
-			pr_info("DHCP: sending class identifier \"%s\"\n",
-				vendor_class_identifier);
-			*e++ = 60;	/* Class-identifier */
-			len = strlen(vendor_class_identifier);
-			*e++ = len;
-			memcpy(e, vendor_class_identifier, len);
-			e += len;
-		}
-		len = strlen(dhcp_client_identifier + 1);
-		/* the minimum length of identifier is 2, include 1 byte type,
-		 * and can not be larger than the length of options
-		 */
-		if (len >= 1 && len < 312 - (e - options) - 1) {
-			*e++ = 61;
-			*e++ = len + 1;
-			memcpy(e, dhcp_client_identifier, len + 1);
-			e += len + 1;
-		}
+	static const u8 ic_req_params[] = {
+		1,	/* Subnet mask */
+		3,	/* Default gateway */
+		6,	/* DNS server */
+		12,	/* Host name */
+		15,	/* Domain name */
+		17,	/* Boot path */
+		26,	/* MTU */
+		40,	/* NIS domain name */
+		42,	/* NTP servers */
+	};
+
+	*e++ = 55;	/* Parameter request list */
+	*e++ = sizeof(ic_req_params);
+	memcpy(e, ic_req_params, sizeof(ic_req_params));
+	e += sizeof(ic_req_params);
+
+	if (ic_host_name_set) {
+		*e++ = 12;	/* host-name */
+		len = strlen(utsname()->nodename);
+		*e++ = len;
+		memcpy(e, utsname()->nodename, len);
+		e += len;
+	}
+	if (*vendor_class_identifier) {
+		pr_info("DHCP: sending class identifier \"%s\"\n",
+			vendor_class_identifier);
+		*e++ = 60;	/* Class-identifier */
+		len = strlen(vendor_class_identifier);
+		*e++ = len;
+		memcpy(e, vendor_class_identifier, len);
+		e += len;
+	}
+	len = strlen(dhcp_client_identifier + 1);
+	/* the minimum length of identifier is 2, include 1 byte type,
+	 * and can not be larger than the length of options
+	 */
+	if (len >= 1 && len < 312 - (e - options) - 1) {
+		*e++ = 61;
+		*e++ = len + 1;
+		memcpy(e, dhcp_client_identifier, len + 1);
+		e += len + 1;
 	}
 
 	*e++ = 255;	/* End of the list */
-- 
Thorsten Blum <thorsten.blum@linux.dev>
GPG: 1D60 735E 8AEF 3BE4 73B6  9D84 7336 78FD 8DFE EAD4

Re: [PATCH net-next] net: ipconfig: Remove outdated comment and indent code block

[Paolo Abeni]

On 12/20/25 2:03 PM, Thorsten Blum wrote:
> The comment has been around ever since commit 1da177e4c3f4
> ("Linux-2.6.12-rc2") and can be removed. Remove it and indent the code
> block accordingly.
> 
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> ---
>  net/ipv4/ipconfig.c | 87 ++++++++++++++++++++++-----------------------
>  1 file changed, 42 insertions(+), 45 deletions(-)
> 
> diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
> index 019408d3ca2c..d577ef580f8c 100644
> --- a/net/ipv4/ipconfig.c
> +++ b/net/ipv4/ipconfig.c
> @@ -705,51 +705,48 @@ ic_dhcp_init_options(u8 *options, struct ic_device *d)
>  		e += 4;
>  	}
>  
> -	/* always? */
> -	{
> -		static const u8 ic_req_params[] = {
> -			1,	/* Subnet mask */
> -			3,	/* Default gateway */
> -			6,	/* DNS server */
> -			12,	/* Host name */
> -			15,	/* Domain name */
> -			17,	/* Boot path */
> -			26,	/* MTU */
> -			40,	/* NIS domain name */
> -			42,	/* NTP servers */
> -		};
> -
> -		*e++ = 55;	/* Parameter request list */
> -		*e++ = sizeof(ic_req_params);
> -		memcpy(e, ic_req_params, sizeof(ic_req_params));
> -		e += sizeof(ic_req_params);
> -
> -		if (ic_host_name_set) {
> -			*e++ = 12;	/* host-name */
> -			len = strlen(utsname()->nodename);
> -			*e++ = len;
> -			memcpy(e, utsname()->nodename, len);
> -			e += len;
> -		}
> -		if (*vendor_class_identifier) {
> -			pr_info("DHCP: sending class identifier \"%s\"\n",
> -				vendor_class_identifier);
> -			*e++ = 60;	/* Class-identifier */
> -			len = strlen(vendor_class_identifier);
> -			*e++ = len;
> -			memcpy(e, vendor_class_identifier, len);
> -			e += len;
> -		}
> -		len = strlen(dhcp_client_identifier + 1);
> -		/* the minimum length of identifier is 2, include 1 byte type,
> -		 * and can not be larger than the length of options
> -		 */
> -		if (len >= 1 && len < 312 - (e - options) - 1) {
> -			*e++ = 61;
> -			*e++ = len + 1;
> -			memcpy(e, dhcp_client_identifier, len + 1);
> -			e += len + 1;
> -		}
> +	static const u8 ic_req_params[] = {
> +		1,	/* Subnet mask */
> +		3,	/* Default gateway */
> +		6,	/* DNS server */
> +		12,	/* Host name */
> +		15,	/* Domain name */
> +		17,	/* Boot path */
> +		26,	/* MTU */
> +		40,	/* NIS domain name */
> +		42,	/* NTP servers */
> +	};

I think you additionally need to move the const definition at function
start. Besides...

## Form letter - net-next-closed

The net-next tree is closed for new drivers, features, code refactoring
and optimizations due to the merge window and the winter break. We are
currently accepting bug fixes only.

Please repost when net-next reopens after Jan 2nd.

RFC patches sent for review only are obviously welcome at any time.