net: ipconfig: Remove outdated comment and indent code block
Subsystems (3)
PATCH v2 1/1 net: ipconfig: Remove outdated comment and indent code block
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.
---
Changes in v2:
- Move const definition to the top (Paolo)
- Format ternary expression
- Link to v1: https://lore.kernel.org/lkml/[email protected]/
--- net/ipv4/ipconfig.c | 89 +++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 47 deletions(-)
net/ipv4/ipconfig.c +42 -47
@@ -679,8 +679,18 @@ static const u8 ic_bootp_cookie[4] = { 99, 130, 83, 99 };static void __init ic_dhcp_init_options (u8 *options,struct ic_device *d) { -u8 mt = ((ic_servaddr ==NONE ) - ?DHCPDISCOVER :DHCPREQUEST ); +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 */ + }; +u8 mt = (ic_servaddr ==NONE ) ?DHCPDISCOVER :DHCPREQUEST ;u8 *e = options;int len;
@@ -705,51 +715,36 @@ 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 ; - } + *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 */
Signature · 2 lines
Thorsten Blum <[email protected]> GPG: 1D60 735E 8AEF 3BE4 73B6 9D84 7336 78FD 8DFE EAD4
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 4 lines · On Fri, 9 Jan 2026 13:11:29 +0100 you 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.
Quoted 8 lines
Signed-off-by Thorsten Blum <[email protected]>---
Changes in v2:
- Move const definition to the top (Paolo)
- Format ternary expression
- Link to v1: https://lore.kernel.org/lkml/[email protected]/[...]
Here is the summary with links:
- [net-next,v2] net: ipconfig: Remove outdated comment and indent code block
https://git.kernel.org/netdev/net-next/c/e405b3c9d4aa
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html