Commit cd557bc1 authored by Denis V. Lunev's avatar Denis V. Lunev Committed by David S. Miller

[IGMP]: Optimize kfree_skb in igmp_rcv.

Merge error paths inside igmp_rcv.
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bd2f7476
...@@ -922,13 +922,11 @@ int igmp_rcv(struct sk_buff *skb) ...@@ -922,13 +922,11 @@ int igmp_rcv(struct sk_buff *skb)
struct in_device *in_dev = in_dev_get(skb->dev); struct in_device *in_dev = in_dev_get(skb->dev);
int len = skb->len; int len = skb->len;
if (in_dev==NULL) { if (in_dev == NULL)
kfree_skb(skb); goto drop;
return 0;
}
if (!pskb_may_pull(skb, sizeof(struct igmphdr))) if (!pskb_may_pull(skb, sizeof(struct igmphdr)))
goto drop; goto drop_ref;
switch (skb->ip_summed) { switch (skb->ip_summed) {
case CHECKSUM_COMPLETE: case CHECKSUM_COMPLETE:
...@@ -938,7 +936,7 @@ int igmp_rcv(struct sk_buff *skb) ...@@ -938,7 +936,7 @@ int igmp_rcv(struct sk_buff *skb)
case CHECKSUM_NONE: case CHECKSUM_NONE:
skb->csum = 0; skb->csum = 0;
if (__skb_checksum_complete(skb)) if (__skb_checksum_complete(skb))
goto drop; goto drop_ref;
} }
ih = igmp_hdr(skb); ih = igmp_hdr(skb);
...@@ -972,8 +970,9 @@ int igmp_rcv(struct sk_buff *skb) ...@@ -972,8 +970,9 @@ int igmp_rcv(struct sk_buff *skb)
break; break;
} }
drop: drop_ref:
in_dev_put(in_dev); in_dev_put(in_dev);
drop:
kfree_skb(skb); kfree_skb(skb);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment