From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2826C55181 for ; Mon, 20 Apr 2020 23:13:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8A43120B1F for ; Mon, 20 Apr 2020 23:13:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587424436; bh=IJoblJrKmdPBE7qDj3flqI5r1dSjI70VvE8SNpNW+wM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=NUy1XAXUmtQ0+iaXMonoDD1e8oIlDEOa61ZZ1mAk/1A4bLJ/nPH/zFJgLLlXAAv5/ hCVVW+sFudS0DVUYdN/C1SAjSLkq8YU1r7xKsnIzS6AlIKMEbcIheNMG+YiSzLxHWS YWBELdCA2srcgrz+uOZE8lDrr6g4Nr3uEnHy86vY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726982AbgDTXNz (ORCPT ); Mon, 20 Apr 2020 19:13:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:39642 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726847AbgDTXNz (ORCPT ); Mon, 20 Apr 2020 19:13:55 -0400 Received: from C02YQ0RWLVCF.internal.digitalocean.com (c-73-181-34-237.hsd1.co.comcast.net [73.181.34.237]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7D62A21D79; Mon, 20 Apr 2020 23:13:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587424434; bh=IJoblJrKmdPBE7qDj3flqI5r1dSjI70VvE8SNpNW+wM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UQiP9/cowrrI0iHJRRy0qoU4IKzQeTMJ9xPQ+hM9uEEiki1ei64CHogB/rSqOfTDN ylnu8FqCmaxsnv02/kMyWE1aRLvZIepoTJfWTLPHCGuemWUBsCIpeC7JlC4MSqdfaE nU8djT1qS4O2TcUoHvLfc7LtDrpzd/Ufn/wP1QM0= From: David Ahern To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, trev@larock.ca, David Ahern Subject: [PATCH net 1/2] xfrm: Always set XFRM_TRANSFORMED in xfrm{4,6}_output_finish Date: Mon, 20 Apr 2020 17:13:51 -0600 Message-Id: <20200420231352.50855-2-dsahern@kernel.org> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <20200420231352.50855-1-dsahern@kernel.org> References: <20200420231352.50855-1-dsahern@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern IPSKB_XFRM_TRANSFORMED and IP6SKB_XFRM_TRANSFORMED are skb flags set by xfrm code to tell other skb handlers that the packet has been passed through the xfrm output functions. Simplify the code and just always set them rather than conditionally based on netfilter enabled thus making the flag available for other users. Signed-off-by: David Ahern --- net/ipv4/xfrm4_output.c | 2 -- net/ipv6/xfrm6_output.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/net/ipv4/xfrm4_output.c b/net/ipv4/xfrm4_output.c index 89ba7c87de5d..30ddb9dc9398 100644 --- a/net/ipv4/xfrm4_output.c +++ b/net/ipv4/xfrm4_output.c @@ -58,9 +58,7 @@ int xfrm4_output_finish(struct sock *sk, struct sk_buff *skb) { memset(IPCB(skb), 0, sizeof(*IPCB(skb))); -#ifdef CONFIG_NETFILTER IPCB(skb)->flags |= IPSKB_XFRM_TRANSFORMED; -#endif return xfrm_output(sk, skb); } diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c index fbe51d40bd7e..e34167f790e6 100644 --- a/net/ipv6/xfrm6_output.c +++ b/net/ipv6/xfrm6_output.c @@ -111,9 +111,7 @@ int xfrm6_output_finish(struct sock *sk, struct sk_buff *skb) { memset(IP6CB(skb), 0, sizeof(*IP6CB(skb))); -#ifdef CONFIG_NETFILTER IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED; -#endif return xfrm_output(sk, skb); } -- 2.20.1