From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
Steffen Klassert <steffen.klassert@secunet.com>,
<netdev@vger.kernel.org>
Subject: [PATCH 2/5] xfrm: merge fixup for "remove output_finish indirection from xfrm_state_afinfo"
Date: Fri, 19 Jun 2020 09:43:39 +0200 [thread overview]
Message-ID: <20200619074342.14095-3-steffen.klassert@secunet.com> (raw)
In-Reply-To: <20200619074342.14095-1-steffen.klassert@secunet.com>
From: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
net/xfrm/xfrm_output.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c
index e4c23f69f69f..a7ab19353313 100644
--- a/net/xfrm/xfrm_output.c
+++ b/net/xfrm/xfrm_output.c
@@ -574,16 +574,12 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb)
switch (x->outer_mode.family) {
case AF_INET:
memset(IPCB(skb), 0, sizeof(*IPCB(skb)));
-#ifdef CONFIG_NETFILTER
IPCB(skb)->flags |= IPSKB_XFRM_TRANSFORMED;
-#endif
break;
case AF_INET6:
memset(IP6CB(skb), 0, sizeof(*IP6CB(skb)));
-#ifdef CONFIG_NETFILTER
IP6CB(skb)->flags |= IP6SKB_XFRM_TRANSFORMED;
-#endif
break;
}
--
2.17.1
next prev parent reply other threads:[~2020-06-19 7:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-19 7:43 pull request (net): ipsec 2020-06-19 Steffen Klassert
2020-06-19 7:43 ` [PATCH 1/5] xfrm: Fix double ESP trailer insertion in IPsec crypto offload Steffen Klassert
2020-06-19 7:43 ` Steffen Klassert [this message]
2020-06-19 7:43 ` [PATCH 3/5] esp, ah: consolidate the crypto algorithm selections Steffen Klassert
2020-06-19 7:43 ` [PATCH 4/5] esp: select CRYPTO_SEQIV Steffen Klassert
2020-06-19 7:43 ` [PATCH 5/5] esp, ah: modernize the crypto algorithm selections Steffen Klassert
2020-06-19 20:04 ` pull request (net): ipsec 2020-06-19 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200619074342.14095-3-steffen.klassert@secunet.com \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox