@@ -2355,8 +2355,8 @@ struct eth_spe {
* doorbell data in host memory
*/
struct eth_tx_db_data {
- u32 packets_prod;
- u16 bds_prod;
+ __le32 packets_prod;
+ __le16 bds_prod;
u16 reserved;
};
@@ -8774,11 +8774,9 @@ static int bnx2x_run_loopback(struct bnx2x *bp, int loopback_mode, u8 link_up)
wmb();
- fp->hw_tx_prods->bds_prod =
- cpu_to_le16(le16_to_cpu(fp->hw_tx_prods->bds_prod) + 1);
+ le16_add_cpu(&fp->hw_tx_prods->bds_prod, 1);
mb(); /* FW restriction: must not reorder writing nbd and packets */
- fp->hw_tx_prods->packets_prod =
- cpu_to_le32(le32_to_cpu(fp->hw_tx_prods->packets_prod) + 1);
+ le32_add_cpu(&fp->hw_tx_prods->packets_prod, 1);
DOORBELL(bp, fp->index, 0);
mmiowb();
@@ -9774,11 +9772,9 @@ static int bnx2x_start_xmit(struct sk_buff *skb, struct net_device *dev)
*/
wmb();
- fp->hw_tx_prods->bds_prod =
- cpu_to_le16(le16_to_cpu(fp->hw_tx_prods->bds_prod) + nbd);
+ le16_add_cpu(&fp->hw_tx_prods->bds_prod, nbd);
mb(); /* FW restriction: must not reorder writing nbd and packets */
- fp->hw_tx_prods->packets_prod =
- cpu_to_le32(le32_to_cpu(fp->hw_tx_prods->packets_prod) + 1);
+ le32_add_cpu(&fp->hw_tx_prods->packets_prod, 1);
DOORBELL(bp, fp->index, 0);
mmiowb();
Always treated as little-endian values, annotate as such, use the leXX_add_cpu helpers rather than opencoded byteswapping. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> --- drivers/net/bnx2x_hsi.h | 4 ++-- drivers/net/bnx2x_main.c | 12 ++++-------- 2 files changed, 6 insertions(+), 10 deletions(-)