From: Sowmini Varadhan <sowmini.varadhan@oracle•com>
To: netdev@vger•kernel.org
Cc: davem@davemloft•net, daniel@iogearbox•net, sowmini.varadhan@oracle•com
Subject: [PATCH net-next] skbuff: remove unused variable `doff'
Date: Tue, 10 May 2016 12:38:08 -0400 [thread overview]
Message-ID: <20160510163808.GN13183@oracle.com> (raw)
There are two instances of an unused variable, `doff' added by
commit 6fa01ccd8830 ("skbuff: Add pskb_extract() helper function")
in pskb_carve_inside_header() and pskb_carve_inside_nonlinear().
Remove these instances, they are not used.
Reported by: Daniel Borkmann <daniel@iogearbox•net>
Signed-off-by: Sowmini Varadhan <sowmini.varadhan@oracle•com>
---
net/core/skbuff.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 5586be9..f2b77e5 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -4634,7 +4634,6 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off,
int size = skb_end_offset(skb);
int new_hlen = headlen - off;
u8 *data;
- int doff = 0;
size = SKB_DATA_ALIGN(size);
@@ -4674,13 +4673,11 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off,
skb_free_head(skb);
}
- doff = (data - skb->head);
skb->head = data;
skb->data = data;
skb->head_frag = 0;
#ifdef NET_SKBUFF_DATA_USES_OFFSET
skb->end = size;
- doff = 0;
#else
skb->end = skb->head + size;
#endif
@@ -4761,7 +4758,6 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off,
u8 *data;
const int nfrags = skb_shinfo(skb)->nr_frags;
struct skb_shared_info *shinfo;
- int doff = 0;
size = SKB_DATA_ALIGN(size);
@@ -4816,13 +4812,11 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off,
}
skb_release_data(skb);
- doff = (data - skb->head);
skb->head = data;
skb->head_frag = 0;
skb->data = data;
#ifdef NET_SKBUFF_DATA_USES_OFFSET
skb->end = size;
- doff = 0;
#else
skb->end = skb->head + size;
#endif
--
1.7.1
next reply other threads:[~2016-05-10 16:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-10 16:38 Sowmini Varadhan [this message]
2016-05-10 20:05 ` [PATCH net-next] skbuff: remove unused variable `doff' 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=20160510163808.GN13183@oracle.com \
--to=sowmini.varadhan@oracle$(echo .)com \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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