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 4/6] ipv6: remove unused variables in esp6
Date: Fri, 23 Jun 2017 10:38:28 +0200 [thread overview]
Message-ID: <1498207110-22520-5-git-send-email-steffen.klassert@secunet.com> (raw)
In-Reply-To: <1498207110-22520-1-git-send-email-steffen.klassert@secunet.com>
From: Stephen Hemminger <stephen@networkplumber.org>
Resolves warnings:
net/ipv6/esp6.c: In function ‘esp_ssg_unref’:
net/ipv6/esp6.c:121:10: warning: variable ‘seqhi’ set but not used [-Wunused-but-set-variable]
net/ipv6/esp6.c: In function ‘esp6_output_head’:
net/ipv6/esp6.c:227:21: warning: variable ‘esph’ set but not used [-Wunused-but-set-variable]
Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
---
net/ipv6/esp6.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 1fe99ba..53b6b87 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -118,7 +118,6 @@ static inline struct scatterlist *esp_req_sg(struct crypto_aead *aead,
static void esp_ssg_unref(struct xfrm_state *x, void *tmp)
{
- __be32 *seqhi;
struct crypto_aead *aead = x->data;
int seqhilen = 0;
u8 *iv;
@@ -128,7 +127,6 @@ static void esp_ssg_unref(struct xfrm_state *x, void *tmp)
if (x->props.flags & XFRM_STATE_ESN)
seqhilen += sizeof(__be32);
- seqhi = esp_tmp_seqhi(tmp);
iv = esp_tmp_iv(aead, tmp, seqhilen);
req = esp_tmp_req(aead, iv);
@@ -224,12 +222,9 @@ int esp6_output_head(struct xfrm_state *x, struct sk_buff *skb, struct esp_info
u8 *vaddr;
int nfrags;
struct page *page;
- struct ip_esp_hdr *esph;
struct sk_buff *trailer;
int tailen = esp->tailen;
- esph = ip_esp_hdr(skb);
-
if (!skb_cloned(skb)) {
if (tailen <= skb_availroom(skb)) {
nfrags = 1;
--
2.7.4
next prev parent reply other threads:[~2017-06-23 8:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-23 8:38 pull request (net-next): ipsec-next 2017-06-23 Steffen Klassert
2017-06-23 8:38 ` [PATCH 1/6] xfrm: use memdup_user Steffen Klassert
2017-06-23 8:38 ` [PATCH 2/6] xfrm: Make function xfrm_dev_register static Steffen Klassert
2017-06-23 8:38 ` [PATCH 3/6] ah: use crypto_memneq to check the ICV Steffen Klassert
2017-06-23 8:38 ` Steffen Klassert [this message]
2017-06-23 8:38 ` [PATCH 5/6] xfrm: extend MIGRATE with UDP encapsulation port Steffen Klassert
2017-06-23 8:38 ` [PATCH 6/6] xfrm: add UDP encapsulation port in migrate message Steffen Klassert
2017-06-23 18:18 ` pull request (net-next): ipsec-next 2017-06-23 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=1498207110-22520-5-git-send-email-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;
as well as URLs for NNTP newsgroup(s).