]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
skbuff: remove unused variable `doff'
authorSowmini Varadhan <sowmini.varadhan@oracle.com>
Tue, 10 May 2016 16:38:08 +0000 (12:38 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 May 2016 20:05:12 +0000 (16:05 -0400)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/core/skbuff.c

index 5586be93632fb8ef1d5629d2a0f5faa27290ba74..f2b77e549c03a771909cd9c87c40ec2b7826cd31 100644 (file)
@@ -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