diff options
| author | Eric Dumazet <edumazet@google.com> | 2013-01-17 05:26:07 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-20 23:10:52 -0500 |
| commit | 546bfedbe604baeb5a03736593bb95c9aa56bcfa (patch) | |
| tree | fe03150d7686d76428e3dc74d60abf65ee202b5f /drivers/net/ethernet/mellanox | |
| parent | fb568637e58a8459edd551af1160f27ea53e8367 (diff) | |
| download | blackbird-op-linux-546bfedbe604baeb5a03736593bb95c9aa56bcfa.tar.gz blackbird-op-linux-546bfedbe604baeb5a03736593bb95c9aa56bcfa.zip | |
net/mlx4_en: remove redundant code
remove redundant code from build_inline_wqe()
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-By: Amir Vadai <amirv@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c index 2b799f4f1c37..16af338880c3 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) |
