From patchwork Thu Jan 17 15:26:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [net-next] net/mlx4_en: remove redundant code Date: Thu, 17 Jan 2013 05:26:07 -0000 From: Eric Dumazet X-Patchwork-Id: 213306 Message-Id: <1358436367.29723.49.camel@edumazet-glaptop> To: Amir Vadai Cc: "David S. Miller" , netdev@vger.kernel.org, Or Gerlitz , Yevgeny Petrilin , Eugenia Emantayev From: Eric Dumazet remove redundant code from build_inline_wqe() Signed-off-by: Eric Dumazet Acked-By: Amir Vadai --- Amir, reviewing this driver, it looks like following could be done, could you test the patch for me ? Thanks -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c index 2b799f4..16af338 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c @@ -515,10 +515,6 @@ static void build_inline_wqe(struct mlx4_en_tx_desc *tx_desc, struct sk_buff *sk wmb(); inl->byte_count = cpu_to_be32(1 << 31 | (skb->len - spc)); } - tx_desc->ctrl.vlan_tag = cpu_to_be16(*vlan_tag); - tx_desc->ctrl.ins_vlan = MLX4_WQE_CTRL_INS_VLAN * - (!!vlan_tx_tag_present(skb)); - tx_desc->ctrl.fence_size = (real_size / 16) & 0x3f; } u16 mlx4_en_select_queue(struct net_device *dev, struct sk_buff *skb)