Re: [PATCH] fix warning in drivers/net/sis900.c

From: Martin J. Bligh (mbligh@aracnet.com)
Date: Thu Mar 20 2003 - 02:34:16 EST


>> drivers/net/sis900.c: In function `set_rx_mode':
>> drivers/net/sis900.c:2100: warning: passing arg 2 of `set_bit' from incompatible pointer type
>>
>> I just cast this. Seems to work fine at the moment, so presumably it's
>> correct.
>
>
> Nope -- set_bit wants to work on a real unsigned long.
> While your patch will work, the proper fix is to not use set_bit :)

Fair enough. How about this? (compile tested, but not machine-tested)
mc_filter is declared as this ...
u16 mc_filter[16] = {0}; /* 256/128 bits multicast hash table */
so I just split off the high & low parts, and use them seperately ...

M.

diff -urpN -X /home/fletch/.diff.exclude virgin/drivers/net/sis900.c sisfix/drivers/net/sis900.c
--- virgin/drivers/net/sis900.c Mon Mar 17 21:43:45 2003
+++ sisfix/drivers/net/sis900.c Wed Mar 19 23:27:49 2003
@@ -2094,10 +2094,13 @@ static void set_rx_mode(struct net_devic
                    use Receive Filter to reject unwanted MCAST packet */
                 struct dev_mc_list *mclist;
                 rx_mode = RFAAB;
- for (i = 0, mclist = net_dev->mc_list; mclist && i < net_dev->mc_count;
- i++, mclist = mclist->next)
- set_bit(sis900_compute_hashtable_index(mclist->dmi_addr, revision),
- mc_filter);
+ for (i = 0, mclist = net_dev->mc_list;
+ mclist && i < net_dev->mc_count;
+ i++, mclist = mclist->next) {
+ int index = sis900_compute_hashtable_index(
+ mclist->dmi_addr, revision);
+ mc_filter[index/16] |= (u16) (1 << (index & 0xff));
+ }
         }
 
         /* update Multicast Hash Table in Receive Filter */

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sun Mar 23 2003 - 22:00:29 EST