Skip to contentSkip to conversation

skbuff: remove unused variable `doff'

PATCH Applied Sowmini Varadhan 2 participants 2 messages May 10, 2016

Subsystems (2)
Networking Network drivers
lore
Share & tools
lore

Sowmini Varadhan

author
#0 lore raw

PATCH 1/1 skbuff: remove unused variable `doff'

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 <[email protected]>

Signed-off-by Sowmini Varadhan <[email protected]>
---
 net/core/skbuff.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
net/core/skbuff.c +0 -6
index 5586be9..f2b77e5 100644
@@ -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
Signature · 1 line
1.7.1
maintainer Applied
#1 lore raw

From: Sowmini Varadhan <[email protected]>
Date: Tue, 10 May 2016 12:38:08 -0400

Quoted 7 lines

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 <[email protected]>

Signed-off-by Sowmini Varadhan <[email protected]>

Applied.