Commit 0dfe1782 authored Aug 22, 2011 by Jiri Pirko Committed by David S. Miller Aug 22, 2011

net: vlan: goto another_round instead of calling __netif_receive_skb



Now, when vlan tag on untagged in non-accelerated path is stripped from
skb, headers are reset right away. Benefit from that and avoid calling
__netif_receive_skb recursivelly and just use another_round.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent c8d755b5

net/core/dev.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -3236,10 +3236,9 @@ ncls:
		ret = deliver_skb(skb, pt_prev, orig_dev);
		pt_prev = NULL;
		}
		if (vlan_do_receive(&skb)) {
		ret = __netif_receive_skb(skb);
		goto out;
		} else if (unlikely(!skb))
		if (vlan_do_receive(&skb))
		goto another_round;
		else if (unlikely(!skb))
		goto out;
		}

Admin message