From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B6C74303CAE for ; Mon, 22 Dec 2025 11:42:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766403775; cv=none; b=tFEMIBqiUlT4njlIYN7pzCH9LylTSKtUo+wc6RPbQ7VZrUrQ/E4+cehHMX5o8tFG8gw4duaobwF1vR/PxAxN9Fv2aS87dmUoLd6NqXunI9jJbGHTGcIFyCkI24D60FenzuEiGBBYOZw+unBjIehWXr54cwP9kBlaaciY/a2tSGU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766403775; c=relaxed/simple; bh=LC5Es/H47EQiWgj2ATM095BYi7nqSkflTvEx1KYBu5I=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=WMCRb0Cdp3R3ny8sC3R+q7PqJRgkRcxBNwykcl9m5CfTrnOjpjxrsVUhfW9xW83nVELMfHYR8y+sz5Z7Tt5DQJH2+LLsY4o9oUyaGT66iY64/+tTK9MzGVBf+BW15oL6SY8G2A8/WA1tJGY6j0v0YfA2/TZMu2XLLws1/acapyM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=G+D285IH; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=ra4/gW8i; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="G+D285IH"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="ra4/gW8i" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1766403772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OL2rPpTN43V/NT2Oxv6ZcxzlRknVU1jWoTmSb8azg6U=; b=G+D285IHjjP85GK8xC3lzLMnguqwh1lMJKr7j68U4SobSXzj9kJDJZleUg33PIGNzsQObs toFu29F2d9bksRoivrAKbAIKba8jeZnMe+iUOysiJN/84LLhGQoqRYwm1gItUrgYbN8hzW 8b/g7bvh+jg2s7QFOSkhe3XAR9KlPao= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-665-oTAHs8DHPjys8nmukGrI6g-1; Mon, 22 Dec 2025 06:42:51 -0500 X-MC-Unique: oTAHs8DHPjys8nmukGrI6g-1 X-Mimecast-MFC-AGG-ID: oTAHs8DHPjys8nmukGrI6g_1766403770 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4779981523fso47491405e9.2 for ; Mon, 22 Dec 2025 03:42:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1766403770; x=1767008570; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=OL2rPpTN43V/NT2Oxv6ZcxzlRknVU1jWoTmSb8azg6U=; b=ra4/gW8i529+LX1zAj+sFr6roXU6npsp7WYn5b2wsvMi/eaAmbXQ0DaDC+RgcYQQ7q pCPolFoXB98P1ky+CmMPGoJYub6Uqza6kFK642o1uvohCCi+NdUb2rFEZ4yETrHhh13x 7xSBbezcVcey81p5iKfZXD4Lx9SDbEfMA6LYi8s67NelSQBolJsQ7wK3Qux0QbTy+mKx vdPDZWrnRVAcbhkCLQfk92eSUZUVK7NQOoGSylv1AznMr3BT9YLj5FtJfFP2KG0O3tli G+D2tBYLuxDsYg+z7UnzsmCoA5ccisbpQL/5I5SL9IwmeWeqrPgSAz95bjjRh9nIYBzH j1Zw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766403770; x=1767008570; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OL2rPpTN43V/NT2Oxv6ZcxzlRknVU1jWoTmSb8azg6U=; b=oUcz109lBnWUcP/jSAaLzycBCkFSrx4bqnGmJScofyiT7OKpy2vDE+jAEa3GrxoA5v O9TZ5/vUDheMHLsocq9pcvOT6ZG7Fh6KltsEc1XoGTixkvGicOpDjdCP+WlIvmXsR557 HIpAvFJIeoKM3hfNEIO8iTg8a0XBpahqDQYQbmQfkyjZwBbiL+iLguYq4EcWsJz8qQLH IMEC/AKZYVX0nDoTooDFNJX6NJ0piqL7SaZmAe32iZj+aHtqgL7WhN0SODz68D9l4I32 n9ieSVktkJPI/o1WvtBVQDuO7duLG/Pcm1/XVmVKC/cga+1aKABbHMO2BcRN7Wx06kHF XzLg== X-Forwarded-Encrypted: i=1; AJvYcCX8B77f5Rb8aXLXSwbJSWld7Vcrd67pp4lUQ9AtJ0tV8FmvpZG/9snrdMYTcRFCQCQSZctEwK4jKOaJS2w=@vger.kernel.org X-Gm-Message-State: AOJu0Yz15XlIErBEiFb8nJRJ3f2facSXvVE0LgdY2h9fDd0W1X7xJvR5 X989ndiyHMLfWlHjhqbuKFXJCkVloYjyh0KQnva4RLzkIqcusX3R8TwqBL6uaMJbtaJMgnqIOPe W4OLbuz3Dz1yc+NUpme3wsAE5VFsbwYipJOZMi1IIzAz1wJEcpJZYH1+pcelHtAUjZiaNRJEgzw == X-Gm-Gg: AY/fxX4gEd/9TFx0HWoefOspv5fIrsiVwahY6kRTuAQionzIFwpg/7u+NpehUATP8wk JJYpONNopMka7AFLSSOivyC7GAc6C3xPTYdSMQ/xW3YV29XUNq2rmWoUxVOPQ5qct71toot3ELh bqlfYkezBW6Bl/HMpcAhmICIeXlv+iJZ4hvTSyODJBqxBAVb6swGEacUkgZVSgrrGhyuef9UR8o tPxibokggiS2OVq71PeieN/ycEhaMNKybl7BAZQ8QTtzVtfaj32eQWhBJRcuXjM1mNoPEVNzwR6 KzEV133z/j3Z5aOip1y5FLtvQ2g4vIKH3GJSXq4v5nZ2o1kQbkVKWFqvynxK9TcZoV2jWnvshCD JDqSXR0UQ+4OO X-Received: by 2002:a05:600c:1c98:b0:477:c37:2ea7 with SMTP id 5b1f17b1804b1-47d195a7351mr134797355e9.21.1766403770237; Mon, 22 Dec 2025 03:42:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IFaGxZ5s7QwvagSljRfUqA1tEtTHBTejTtnXxbuyyLQTAicT6p8TfzcBFjNe2w4AsD9SZ8jhQ== X-Received: by 2002:a05:600c:1c98:b0:477:c37:2ea7 with SMTP id 5b1f17b1804b1-47d195a7351mr134797075e9.21.1766403769866; Mon, 22 Dec 2025 03:42:49 -0800 (PST) Received: from [192.168.88.32] ([216.128.11.164]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47be3a541d6sm92914235e9.8.2025.12.22.03.42.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 22 Dec 2025 03:42:49 -0800 (PST) Message-ID: Date: Mon, 22 Dec 2025 12:42:48 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH net-next] net: ipconfig: Remove outdated comment and indent code block To: Thorsten Blum , "David S. Miller" , David Ahern , Eric Dumazet , Jakub Kicinski , Simon Horman Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org References: <20251220130335.77220-1-thorsten.blum@linux.dev> Content-Language: en-US From: Paolo Abeni In-Reply-To: <20251220130335.77220-1-thorsten.blum@linux.dev> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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 > --- > 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.