mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
gro: Avoid unnecessary comparison after skb_gro_header
For the overwhelming majority of cases, skb_gro_header's return value cannot be NULL. Yet we must check it because of its current form. This patch splits it up into multiple functions in order to avoid this. Signed-off-by: Herbert Xu <[email protected]> Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
7489594cb2
commit
a5b1cf288d
5 changed files with 62 additions and 26 deletions
|
|
@ -817,13 +817,20 @@ static struct sk_buff **ipv6_gro_receive(struct sk_buff **head,
|
|||
struct sk_buff *p;
|
||||
struct ipv6hdr *iph;
|
||||
unsigned int nlen;
|
||||
unsigned int hlen;
|
||||
unsigned int off;
|
||||
int flush = 1;
|
||||
int proto;
|
||||
__wsum csum;
|
||||
|
||||
iph = skb_gro_header(skb, sizeof(*iph));
|
||||
if (unlikely(!iph))
|
||||
goto out;
|
||||
off = skb_gro_offset(skb);
|
||||
hlen = off + sizeof(*iph);
|
||||
iph = skb_gro_header_fast(skb, off);
|
||||
if (skb_gro_header_hard(skb, hlen)) {
|
||||
iph = skb_gro_header_slow(skb, hlen, off);
|
||||
if (unlikely(!iph))
|
||||
goto out;
|
||||
}
|
||||
|
||||
skb_gro_pull(skb, sizeof(*iph));
|
||||
skb_set_transport_header(skb, skb_gro_offset(skb));
|
||||
|
|
|
|||
Loading…
Reference in a new issue