net: ipv6: remove unused code in ipv6_find_hdr()

Lin Zhang · davem330 · commit 380537b4f7f2 · 2017-10-05T21:53:02.000-07:00
Storing the left length of skb into 'len' actually has no effect
so we can remove it.

Signed-off-by: Lin Zhang &lt;xiaolou4617@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/ipv6/exthdrs_core.c b/net/ipv6/exthdrs_core.c
@@ -187,7 +187,6 @@ int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
 {
 	unsigned int start = skb_network_offset(skb) + sizeof(struct ipv6hdr);
 	u8 nexthdr = ipv6_hdr(skb)->nexthdr;
-	unsigned int len;
 	bool found;
 
 	if (fragoff)
@@ -204,7 +203,6 @@ int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
 		start = *offset + sizeof(struct ipv6hdr);
 		nexthdr = ip6->nexthdr;
 	}
-	len = skb->len - start;
 
 	do {
 		struct ipv6_opt_hdr _hdr, *hp;
@@ -273,7 +271,6 @@ int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
 
 		if (!found) {
 			nexthdr = hp->nexthdr;
-			len -= hdrlen;
 			start += hdrlen;
 		}
 	} while (!found);

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,6 @@ int ipv6_find_hdr(const struct sk_buff skb, unsigned int offset,`
`187`	`187`	`{`
`188`	`188`	`unsigned int start = skb_network_offset(skb) + sizeof(struct ipv6hdr);`
`189`	`189`	`u8 nexthdr = ipv6_hdr(skb)->nexthdr;`
`190`		`- unsigned int len;`
`191`	`190`	`bool found;`
`192`	`191`
`193`	`192`	`if (fragoff)`
`@@ -204,7 +203,6 @@ int ipv6_find_hdr(const struct sk_buff skb, unsigned int offset,`
`204`	`203`	`start = *offset + sizeof(struct ipv6hdr);`
`205`	`204`	`nexthdr = ip6->nexthdr;`
`206`	`205`	`}`
`207`		`- len = skb->len - start;`
`208`	`206`
`209`	`207`	`do {`
`210`	`208`	`struct ipv6_opt_hdr _hdr, *hp;`
`@@ -273,7 +271,6 @@ int ipv6_find_hdr(const struct sk_buff skb, unsigned int offset,`
`273`	`271`
`274`	`272`	`if (!found) {`
`275`	`273`	`nexthdr = hp->nexthdr;`
`276`		`- len -= hdrlen;`
`277`	`274`	`start += hdrlen;`
`278`	`275`	`}`
`279`	`276`	`} while (!found);`