Merge tag 'stable/for-linus-3.14-rc0-late-tag' of git://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / net / bridge / br_vlan.c

diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c
index af5ebd18d7059f2d0cc289e226c544f210309dc2..4ca4d0a0151c49926dd7e47c6ac5bc8f6b5d28f0 100644 (file)
--- a/net/bridge/br_vlan.c
+++ b/net/bridge/br_vlan.c
@@ -146,32 +146,11 @@ struct sk_buff *br_handle_vlan(struct net_bridge *br,
 
        /* At this point, we know that the frame was filtered and contains
         * a valid vlan id.  If the vlan id is set in the untagged bitmap,
-        * send untagged; otherwise, send taged.
+        * send untagged; otherwise, send tagged.
         */
        br_vlan_get_tag(skb, &vid);
        if (test_bit(vid, pv->untagged_bitmap))
                skb = br_vlan_untag(skb);
-       else {
-               /* Egress policy says "send tagged".  If output device
-                * is the  bridge, we need to add the VLAN header
-                * ourselves since we'll be going through the RX path.
-                * Sending to ports puts the frame on the TX path and
-                * we let dev_hard_start_xmit() add the header.
-                */
-               if (skb->protocol != htons(ETH_P_8021Q) &&
-                   pv->port_idx == 0) {
-                       /* vlan_put_tag expects skb->data to point to
-                        * mac header.
-                        */
-                       skb_push(skb, ETH_HLEN);
-                       skb = __vlan_put_tag(skb, skb->vlan_proto, skb->vlan_tci);
-                       if (!skb)
-                               goto out;
-                       /* put skb->data back to where it was */
-                       skb_pull(skb, ETH_HLEN);
-                       skb->vlan_tci = 0;
-               }
-       }
 
 out:
        return skb;