mlx4: do vlan cleanup

[pandora-kernel.git] / drivers / net / mlx4 / en_rx.c

diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c
index 5197b50..37cc9e5 100644 (file)
--- a/drivers/net/mlx4/en_rx.c
+++ b/drivers/net/mlx4/en_rx.c
@@ -611,11 +611,14 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
                                        gro_skb->truesize += length;
                                        gro_skb->ip_summed = CHECKSUM_UNNECESSARY;
 
-                                       if (priv->vlgrp && (cqe->vlan_my_qpn &
-                                                           cpu_to_be32(MLX4_CQE_VLAN_PRESENT_MASK)))
-                                               vlan_gro_frags(&cq->napi, priv->vlgrp, be16_to_cpu(cqe->sl_vid));
-                                       else
-                                               napi_gro_frags(&cq->napi);
+                                       if (cqe->vlan_my_qpn &
+                                           cpu_to_be32(MLX4_CQE_VLAN_PRESENT_MASK)) {
+                                               u16 vid = be16_to_cpu(cqe->sl_vid);
+
+                                               __vlan_hwaccel_put_tag(gro_skb, vid);
+                                       }
+
+                                       napi_gro_frags(&cq->napi);
 
                                        goto next;
                                }
@@ -647,13 +650,12 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
                skb->protocol = eth_type_trans(skb, dev);
                skb_record_rx_queue(skb, cq->ring);
 
+               if (be32_to_cpu(cqe->vlan_my_qpn) &
+                   MLX4_CQE_VLAN_PRESENT_MASK)
+                       __vlan_hwaccel_put_tag(skb, be16_to_cpu(cqe->sl_vid));
+
                /* Push it up the stack */
-               if (priv->vlgrp && (be32_to_cpu(cqe->vlan_my_qpn) &
-                                   MLX4_CQE_VLAN_PRESENT_MASK)) {
-                       vlan_hwaccel_receive_skb(skb, priv->vlgrp,
-                                               be16_to_cpu(cqe->sl_vid));
-               } else
-                       netif_receive_skb(skb);
+               netif_receive_skb(skb);
 
 next:
                ++cq->mcq.cons_index;