From: Eric Dumazet Date: Thu, 17 Jan 2013 05:26:07 +0000 (+0000) Subject: net/mlx4_en: remove redundant code X-Git-Tag: v3.9-rc1~139^2~313 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=546bfedbe604baeb5a03736593bb95c9aa56bcfa;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git net/mlx4_en: remove redundant code remove redundant code from build_inline_wqe() Signed-off-by: Eric Dumazet Acked-By: Amir Vadai Signed-off-by: David S. Miller --- 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)