From patchwork Fri Mar 17 15:55:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 13179275 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4FC9FC7618A for ; Fri, 17 Mar 2023 15:56:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231431AbjCQP4E (ORCPT ); Fri, 17 Mar 2023 11:56:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231393AbjCQPz5 (ORCPT ); Fri, 17 Mar 2023 11:55:57 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 616D6C97FA for ; Fri, 17 Mar 2023 08:55:48 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-540e3b152a3so50498257b3.2 for ; Fri, 17 Mar 2023 08:55:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1679068547; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Dbs/I0DOtCv+iewqkJLf7Kg3v9iYNZTxz8Pm5gPeDaM=; b=mqnAspmHPBp57SmEaKrYcOC8jKDqIPb6qezb/G0HzZAjpEwhe8RnHjxjFZntmHdcH3 mZm7QYTfbomP9gV6FzLoJxp1ahJunZrXLaKLjIU2bqEZcvq8yhTzBNS9lmRPv7k3YJa+ cXkKCVMXuCVevFYMxIcFw+cRBNiQLWb5qBHYb1wcT+7Dg/QsTHh47vbgqRky80aphwkM F9DSo8dzpCLx31vjKBz6PTv8QH+aj2c8tsgqhv0uMd6HCu4JzFM2doAyK7CvuxDITkLR ZHZE9CUKZGzSzrooQirhNHyUHRjHl/Tz3AoV+qT0CnqqhBEqZ0U74WwCfvDycC59Q/Ci GULw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679068547; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Dbs/I0DOtCv+iewqkJLf7Kg3v9iYNZTxz8Pm5gPeDaM=; b=aFiHnriZHYoa8DLo9VcMdOTef3DJfPNQTzOEIE2/6f5n+XWysF11i7GEGiY0FrwfTH jmkNnp33CyewNw8aTHvvxUuPaqexQsJoCaGb20DeYztme5nJ57blWqSwfQkWSvYcfWfU Gs1YOQc4EhbdjjS3cra3zY+sAtqZRxwOWDMRMfgBcjXdQRx9mT13Gn20zwQ9KjaAuR57 2diR+R2xCs3VNeOME7UsPOm3qcdnmWmpZ46XJ2EtG2ozlJXr8xa8jkkjJ32haJehJStn H4ZricuquHRa/AVFNQ79xqrtXhlzPR2rbay+Bw08mCeDOVdfjnT6O8LxaGqTo94kqDfe qglQ== X-Gm-Message-State: AO0yUKXp7XbXqJ/MMhJipwPmYpLItP0wUqF4TJaFf9d3EsGIw+8YHZtX ClFIoXt7rpIv7D6ScvS3Q5TxOmJlElucAg== X-Google-Smtp-Source: AK7set/A0n1EVwj8Rt7Uz1R6tQfh8t+SLxYuimykbpr0nQB2RkqMWDG+l+GaeQ2/PhaVTwUm+1Ji7aoMtgOQlg== X-Received: from edumazet1.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:395a]) (user=edumazet job=sendgmr) by 2002:a05:6902:120b:b0:b51:2cba:b971 with SMTP id s11-20020a056902120b00b00b512cbab971mr26743ybu.10.1679068547667; Fri, 17 Mar 2023 08:55:47 -0700 (PDT) Date: Fri, 17 Mar 2023 15:55:33 +0000 In-Reply-To: <20230317155539.2552954-1-edumazet@google.com> Mime-Version: 1.0 References: <20230317155539.2552954-1-edumazet@google.com> X-Mailer: git-send-email 2.40.0.rc2.332.ga46443480c-goog Message-ID: <20230317155539.2552954-5-edumazet@google.com> Subject: [PATCH net-next 04/10] ipv6: raw: preserve const qualifier in raw6_sk() From: Eric Dumazet To: "David S . Miller" , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, David Ahern , Simon Horman , Willem de Bruijn , Matthieu Baerts , eric.dumazet@gmail.com, Eric Dumazet Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org We can change raw6_sk() to propagate its argument const qualifier, thanks to container_of_const(). Signed-off-by: Eric Dumazet Reviewed-by: Simon Horman --- include/linux/ipv6.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 37dfdcfcdd542fe0efc9a1df967be3da931635d4..839247a4f48ea76b5d6daa9a54a7b87627635066 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -336,10 +336,7 @@ static inline struct ipv6_pinfo *inet6_sk(const struct sock *__sk) return sk_fullsock(__sk) ? inet_sk(__sk)->pinet6 : NULL; } -static inline struct raw6_sock *raw6_sk(const struct sock *sk) -{ - return (struct raw6_sock *)sk; -} +#define raw6_sk(ptr) container_of_const(ptr, struct raw6_sock, inet.sk) #define ipv6_only_sock(sk) (sk->sk_ipv6only) #define ipv6_sk_rxinfo(sk) ((sk)->sk_family == PF_INET6 && \