diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-04-01 17:22:57 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-03 17:22:15 -0400 |
commit | 22bedad3ce112d5ca1eaf043d4990fa2ed698c87 (patch) | |
tree | b6fba5688d48b1396f01d13ee53610dea7749c15 /drivers/net/sis190.c | |
parent | a748ee2426817a95b1f03012d8f339c45c722ae1 (diff) |
net: convert multicast list to list_head
Converts the list and the core manipulating with it to be the same as uc_list.
+uses two functions for adding/removing mc address (normal and "global"
variant) instead of a function parameter.
+removes dev_mcast.c completely.
+exposes netdev_hw_addr_list_* macros along with __hw_addr_* functions for
manipulation with lists on a sandbox (used in bonding and 80211 drivers)
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sis190.c')
-rw-r--r-- | drivers/net/sis190.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index 760d9e83a465..6a05b93ae6c9 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c | |||
@@ -848,13 +848,13 @@ static void sis190_set_rx_mode(struct net_device *dev) | |||
848 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; | 848 | rx_mode = AcceptBroadcast | AcceptMulticast | AcceptMyPhys; |
849 | mc_filter[1] = mc_filter[0] = 0xffffffff; | 849 | mc_filter[1] = mc_filter[0] = 0xffffffff; |
850 | } else { | 850 | } else { |
851 | struct dev_mc_list *mclist; | 851 | struct netdev_hw_addr *ha; |
852 | 852 | ||
853 | rx_mode = AcceptBroadcast | AcceptMyPhys; | 853 | rx_mode = AcceptBroadcast | AcceptMyPhys; |
854 | mc_filter[1] = mc_filter[0] = 0; | 854 | mc_filter[1] = mc_filter[0] = 0; |
855 | netdev_for_each_mc_addr(mclist, dev) { | 855 | netdev_for_each_mc_addr(ha, dev) { |
856 | int bit_nr = | 856 | int bit_nr = |
857 | ether_crc(ETH_ALEN, mclist->dmi_addr) & 0x3f; | 857 | ether_crc(ETH_ALEN, ha->addr) & 0x3f; |
858 | mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); | 858 | mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31); |
859 | rx_mode |= AcceptMulticast; | 859 | rx_mode |= AcceptMulticast; |
860 | } | 860 | } |