tree d494866443c2e2d1faf263e0f184b0d6410f3d3d
parent 31ffdbcb5989c121f2f81a6b5b20c1c4bb21e5fd
author Pavel Emelyanov <xemul@openvz.org> 1200904083 -0800
committer David S. Miller <davem@davemloft.net> 1201561715 -0800

[VLAN]: Move protocol determination to seperate function

I think, that we can make this code flow easier to understand
by introducing the vlan_set_encap_proto() function (I hope the
name is good) to setup the skb proto and merge the paths calling
netif_rx() together.

[Patrick: Modified to apply on top of my previous patches]

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>