From: Steffen Klassert <steffen.klassert@secunet.com>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>
Cc: Herbert Xu <herbert@gondor.apana.org.au>,
Steffen Klassert <steffen.klassert@secunet.com>,
<netdev@vger.kernel.org>
Subject: [PATCH 3/6] xfrm: Remove the repeated declaration
Date: Wed, 23 Jun 2021 08:54:46 +0200 [thread overview]
Message-ID: <20210623065449.2143405-4-steffen.klassert@secunet.com> (raw)
In-Reply-To: <20210623065449.2143405-1-steffen.klassert@secunet.com>
From: Shaokun Zhang <zhangshaokun@hisilicon.com>
Function 'xfrm_parse_spi' is declared twice, so remove the
repeated declaration.
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Shaokun Zhang <zhangshaokun@hisilicon.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
include/net/xfrm.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 6232a5f048bd..b30623678430 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1571,7 +1571,6 @@ int xfrm4_rcv_encap(struct sk_buff *skb, int nexthdr, __be32 spi,
int encap_type);
int xfrm4_transport_finish(struct sk_buff *skb, int async);
int xfrm4_rcv(struct sk_buff *skb);
-int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, __be32 *spi, __be32 *seq);
static inline int xfrm4_rcv_spi(struct sk_buff *skb, int nexthdr, __be32 spi)
{
--
2.25.1
next prev parent reply other threads:[~2021-06-23 6:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-23 6:54 pull request (net): ipsec 2021-06-23 Steffen Klassert
2021-06-23 6:54 ` [PATCH 1/6] xfrm: xfrm_state_mtu should return at least 1280 for ipv6 Steffen Klassert
2021-06-23 6:54 ` [PATCH 2/6] xfrm: policy: Read seqcount outside of rcu-read side in xfrm_policy_lookup_bytype Steffen Klassert
2021-06-23 6:54 ` Steffen Klassert [this message]
2021-06-23 6:54 ` [PATCH 4/6] xfrm: remove the fragment check for ipv6 beet mode Steffen Klassert
2021-06-23 6:54 ` [PATCH 5/6] xfrm: Fix error reporting in xfrm_state_construct Steffen Klassert
2021-06-23 6:54 ` [PATCH 6/6] xfrm: Fix xfrm offload fallback fail case Steffen Klassert
2021-06-23 19:50 ` pull request (net): ipsec 2021-06-23 patchwork-bot+netdevbpf
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=20210623065449.2143405-4-steffen.klassert@secunet.com \
--to=steffen.klassert@secunet.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=kuba@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).