From: Eric Dumazet <eric.dumazet@gmail.com>
To: Amir Vadai <amirv@mellanox.com>
Cc: "David S. Miller" <davem@davemloft.net>,
netdev@vger.kernel.org, Or Gerlitz <ogerlitz@mellanox.com>,
Yevgeny Petrilin <yevgenyp@mellanox.com>,
Eugenia Emantayev <eugenia@mellanox.com>
Subject: [PATCH net-next] net/mlx4_en: remove redundant code
Date: Thu, 17 Jan 2013 07:26:07 -0800 [thread overview]
Message-ID: <1358436367.29723.49.camel@edumazet-glaptop> (raw)
In-Reply-To: <1358432538.29723.8.camel@edumazet-glaptop>
From: Eric Dumazet <edumazet@google.com>
remove redundant code from build_inline_wqe()
Signed-off-by: Eric Dumazet <edumazet@google.com>
---
Amir, reviewing this driver, it looks like following could be done,
could you test the patch for me ?
Thanks
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)
next prev parent reply other threads:[~2013-01-17 15:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-17 11:47 [PATCH net-next V1 0/6] Mellanox Ethernet driver updates 2013-01-16 Amir Vadai
2013-01-17 11:47 ` [PATCH net-next V1 1/6] net/mlx4_en: Issue the dump eth statistics command under lock Amir Vadai
2013-01-17 11:47 ` [PATCH net-next V1 2/6] net/mlx4_en: Fix traffic loss under promiscuous mode Amir Vadai
2013-01-17 11:47 ` [PATCH net-next V1 3/6] net/mlx4_en: Use the correct netif lock on ndo_set_rx_mode Amir Vadai
2013-01-17 11:47 ` [PATCH net-next V1 4/6] net/mlx4_core: Return proper error code when __mlx4_add_one fails Amir Vadai
2013-01-17 11:47 ` [PATCH net-next V1 5/6] net/mlx4_en: Fix a race when closing TX queue Amir Vadai
2013-01-17 14:22 ` Eric Dumazet
2013-01-17 15:26 ` Eric Dumazet [this message]
2013-01-17 16:22 ` [PATCH net-next] net/mlx4_en: remove redundant code Amir Vadai
2013-01-20 14:48 ` Amir Vadai
2013-01-21 4:11 ` David Miller
2013-01-17 20:44 ` [PATCH net-next V1 5/6] net/mlx4_en: Fix a race when closing TX queue David Miller
2013-01-17 11:47 ` [PATCH net-next V1 6/6] net/mlx4_en: Initialize RFS filters lock and list in init_netdev Amir Vadai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358436367.29723.49.camel@edumazet-glaptop \
--to=eric.dumazet@gmail.com \
--cc=amirv@mellanox.com \
--cc=davem@davemloft.net \
--cc=eugenia@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=yevgenyp@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox