Fix VLAN modification action in kernel switch.

[openvswitch] / datapath / datapath.c

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 00dbac7c2249a508f88ac09855ce12cfb2607c69..840364480a5d7ed8755f5fc6daa5caaeb8765054 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -443,10 +443,7 @@ static void
 do_port_input(struct net_bridge_port *p, struct sk_buff *skb) 
 {
        /* Push the Ethernet header back on. */
-       if (skb->protocol == htons(ETH_P_8021Q))
-               skb_push(skb, VLAN_ETH_HLEN);
-       else
-               skb_push(skb, ETH_HLEN);
+       skb_push(skb, ETH_HLEN);
        fwd_port_input(p->dp->chain, skb, p->port_no);
 }