vmxnet3: remove unnecessary byteswapping in BAR writing macros
Subsystems (3)
PATCH 1/2 vmxnet3: remove unnecessary byteswapping in BAR writing macros
readl/writel swap to little-endian internally.
--- drivers/net/vmxnet3/vmxnet3_int.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/vmxnet3/vmxnet3_int.h +4 -4
@@ -330,14 +330,14 @@ struct vmxnet3_adapter { };#define VMXNET3_WRITE_BAR0_REG (adapter, reg, val) \ - writel(cpu_to_le32(val), (adapter)->hw_addr0 + (reg)) + writel((val), (adapter)->hw_addr0 + (reg))#define VMXNET3_READ_BAR0_REG (adapter, reg) \ - le32_to_cpu(readl((adapter)->hw_addr0 + (reg))) + readl((adapter)->hw_addr0 + (reg))#define VMXNET3_WRITE_BAR1_REG (adapter, reg, val) \ - writel(cpu_to_le32(val), (adapter)->hw_addr1 + (reg)) + writel((val), (adapter)->hw_addr1 + (reg))#define VMXNET3_READ_BAR1_REG (adapter, reg) \ - le32_to_cpu(readl((adapter)->hw_addr1 + (reg))) + readl((adapter)->hw_addr1 + (reg))#define VMXNET3_WAKE_QUEUE_THRESHOLD (tq) (5)#define VMXNET3_RX_ALLOC_THRESHOLD (rq, ring_idx, adapter) \
Signature · 1 line
1.7.1
PATCH 2/2 vmxnet: trivial annotation of protocol constant
Noticed by sparse:drivers/net/vmxnet3/vmxnet3_drv.c:876:38: warning: cast from restricted __be16 drivers/net/vmxnet3/vmxnet3_drv.c:876:38: warning: cast from restricted __be16 drivers/net/vmxnet3/vmxnet3_drv.c:876:24: warning: restricted __be16 degrades to integer
--- drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/vmxnet3/vmxnet3_drv.c +1 -1
@@ -873,7 +873,7 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq, count =VMXNET3_TXD_NEEDED (skb_headlen (skb)) +skb_shinfo (skb)->nr_frags +1 ; - ctx.ipv4 = (skb->protocol ==__constant_ntohs (ETH_P_IP )); + ctx.ipv4 = (skb->protocol ==cpu_to_be16 (ETH_P_IP )); ctx.mss =skb_shinfo (skb)->gso_size;if (ctx.mss) {
Signature · 1 line
1.7.1
Re: [PATCH 2/2] vmxnet: trivial annotation of protocol constant
Thanks.
Quoted 27 lines · Harvey Harrison
Noticed by sparse:
drivers/net/vmxnet3/vmxnet3_drv.c:876:38: warning: cast from restricted__be16drivers/net/vmxnet3/vmxnet3_drv.c:876:38: warning: cast from restricted__be16drivers/net/vmxnet3/vmxnet3_drv.c:876:24: warning: restricted__be16degrades to integerSigned-off-by Harvey Harrison <[email protected]>--- drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)drivers/net/vmxnet3/vmxnet3_drv.c +1
-1@@ -873,7 +873,7 @@ vmxnet3_tq_xmit(struct sk_buff *skb, struct vmxnet3_tx_queue *tq, count =VMXNET3_TXD_NEEDED (skb_headlen (skb)) +skb_shinfo (skb)->nr_frags +1 ; - ctx.ipv4 = (skb->protocol ==__constant_ntohs (ETH_P_IP )); + ctx.ipv4 = (skb->protocol ==cpu_to_be16 (ETH_P_IP )); ctx.mss =skb_shinfo (skb)->gso_size;if (ctx.mss) {Signature · 1 line
1.7.1
Re: [PATCH 2/2] vmxnet: trivial annotation of protocol constant
In reply to Harvey HarrisonFrom: Harvey Harrison <[email protected]>
Date: Wed, 27 Oct 2010 20:12:35 -0700
Quoted 6 lines
Noticed by sparse:
drivers/net/vmxnet3/vmxnet3_drv.c:876:38: warning: cast from restricted__be16drivers/net/vmxnet3/vmxnet3_drv.c:876:38: warning: cast from restricted__be16drivers/net/vmxnet3/vmxnet3_drv.c:876:24: warning: restricted__be16degrades to integerSigned-off-by Harvey Harrison <[email protected]>
Applied.
Harvey,
Thanks for working on this. The change looks good.
Quoted 34 lines · Harvey Harrison
readl/writel swap to little-endian internally.
Signed-off-by Harvey Harrison <[email protected]>--- drivers/net/vmxnet3/vmxnet3_int.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)drivers/net/vmxnet3/vmxnet3_int.h +4
-4@@ -330,14 +330,14 @@ struct vmxnet3_adapter { };#define VMXNET3_WRITE_BAR0_REG (adapter, reg, val) \ - writel(cpu_to_le32(val), (adapter)->hw_addr0 + (reg)) + writel((val), (adapter)->hw_addr0 + (reg))#define VMXNET3_READ_BAR0_REG (adapter, reg) \ - le32_to_cpu(readl((adapter)->hw_addr0 + (reg))) + readl((adapter)->hw_addr0 + (reg))#define VMXNET3_WRITE_BAR1_REG (adapter, reg, val) \ - writel(cpu_to_le32(val), (adapter)->hw_addr1 + (reg)) + writel((val), (adapter)->hw_addr1 + (reg))#define VMXNET3_READ_BAR1_REG (adapter, reg) \ - le32_to_cpu(readl((adapter)->hw_addr1 + (reg))) + readl((adapter)->hw_addr1 + (reg))#define VMXNET3_WAKE_QUEUE_THRESHOLD (tq) (5)#define VMXNET3_RX_ALLOC_THRESHOLD (rq, ring_idx, adapter) \Signature · 1 line
1.7.1
From: Harvey Harrison <[email protected]>
Date: Wed, 27 Oct 2010 20:12:34 -0700
Quoted 3 lines
readl/writel swap to little-endian internally.
Signed-off-by Harvey Harrison <[email protected]>
Applied.