net: vlan: goto another_round instead of calling __netif_receive_skb
authorJiri Pirko <jpirko@redhat.com>
Mon, 22 Aug 2011 19:43:22 +0000 (12:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 22 Aug 2011 19:43:22 +0000 (12:43 -0700)
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>
net/core/dev.c

index c2442b4..a4306f7 100644 (file)
@@ -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;
        }