[PATCH 1/1] NetXen: Fix to get the driver working after sparse changes

[PATCH 1/1] NetXen: Fix to get the driver working after sparse changes

[Amit S. Kale]

Signed-off-by: Amit S. Kale <amitkale@netxen.com>

---
 netxen_nic.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index e021a30..2807ef4 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -252,7 +252,7 @@ typedef u32 netxen_ctx_msg;
 #define netxen_set_msg_ctxid(config_word, val)	\
 	((config_word) &= ~(0x3ff<<18), (config_word) |= (val & 0x3ff) << 18)
 #define netxen_set_msg_opcode(config_word, val)	\
-	((config_word) &= ~(0xf<<24), (config_word) |= (val & 0xf) << 24)
+	((config_word) &= ~(0xf<<28), (config_word) |= (val & 0xf) << 28)
 
 struct netxen_rcv_context {
 	__le64 rcv_ring_addr;
@@ -303,14 +303,14 @@ struct netxen_ring_ctx {
 	(cmd_desc)->flags_opcode |= cpu_to_le16((val) & 0x7f))
 #define netxen_set_cmd_desc_opcode(cmd_desc, val)	\
 	((cmd_desc)->flags_opcode &= ~cpu_to_le16(0x3f<<7), \
-	(cmd_desc)->flags_opcode |= cpu_to_le16((val) & (0x3f<<7)))
+	(cmd_desc)->flags_opcode |= cpu_to_le16(((val & 0x3f)<<7)))
 
 #define netxen_set_cmd_desc_num_of_buff(cmd_desc, val)	\
 	((cmd_desc)->num_of_buffers_total_length &= ~cpu_to_le32(0xff), \
 	(cmd_desc)->num_of_buffers_total_length |= cpu_to_le32((val) & 0xff))
 #define netxen_set_cmd_desc_totallength(cmd_desc, val)	\
-	((cmd_desc)->num_of_buffers_total_length &= cpu_to_le32(0xff), \
-	(cmd_desc)->num_of_buffers_total_length |= cpu_to_le32(val << 24))
+	((cmd_desc)->num_of_buffers_total_length &= ~cpu_to_le32(0xffffff00), \
+	(cmd_desc)->num_of_buffers_total_length |= cpu_to_le32(val << 8))
 
 #define netxen_get_cmd_desc_opcode(cmd_desc)	\
 	((le16_to_cpu((cmd_desc)->flags_opcode) >> 7) & 0x003F)

Re: [PATCH 1/1] NetXen: Fix to get the driver working after sparse changes

[Al Viro]

On Mon, Feb 12, 2007 at 04:33:38AM -0800, Amit S. Kale wrote:
> Signed-off-by: Amit S. Kale <amitkale@netxen.com>

ACK.  My apologies - that pile of brainos had been introduced when
I'd been fixing the set_bit() abuses in there (a bunch of places
had been casting address of u32 to unsigned long * and then using
set_bit() to modify it).  FWIW, it had nothing to do with sparse -
just enough RTFS to spot the original bug and not enough of
RTFPatch to spot the introduced breakage.  Sorry.

Re: [PATCH 1/1] NetXen: Fix to get the driver working after sparse changes

[Jeff Garzik]

Amit S. Kale wrote:
> Signed-off-by: Amit S. Kale <amitkale@netxen.com>
> 
> ---
>  netxen_nic.h |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)

applied