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/wireless/ray_cs.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/wireless/ray_cs.c')
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 4f5bdb528ef7..54680a3a5acb 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -1875,17 +1875,17 @@ static void ray_update_multi_list(struct net_device *dev, int all) | |||
1875 | writeb(0xff, &pccs->var); | 1875 | writeb(0xff, &pccs->var); |
1876 | local->num_multi = 0xff; | 1876 | local->num_multi = 0xff; |
1877 | } else { | 1877 | } else { |
1878 | struct dev_mc_list *dmi; | 1878 | struct netdev_hw_addr *ha; |
1879 | int i = 0; | 1879 | int i = 0; |
1880 | 1880 | ||
1881 | /* Copy the kernel's list of MC addresses to card */ | 1881 | /* Copy the kernel's list of MC addresses to card */ |
1882 | netdev_for_each_mc_addr(dmi, dev) { | 1882 | netdev_for_each_mc_addr(ha, dev) { |
1883 | memcpy_toio(p, dmi->dmi_addr, ETH_ALEN); | 1883 | memcpy_toio(p, ha->addr, ETH_ALEN); |
1884 | dev_dbg(&link->dev, | 1884 | dev_dbg(&link->dev, |
1885 | "ray_update_multi add addr %02x%02x%02x%02x%02x%02x\n", | 1885 | "ray_update_multi add addr %02x%02x%02x%02x%02x%02x\n", |
1886 | dmi->dmi_addr[0], dmi->dmi_addr[1], | 1886 | ha->addr[0], ha->addr[1], |
1887 | dmi->dmi_addr[2], dmi->dmi_addr[3], | 1887 | ha->addr[2], ha->addr[3], |
1888 | dmi->dmi_addr[4], dmi->dmi_addr[5]); | 1888 | ha->addr[4], ha->addr[5]); |
1889 | p += ETH_ALEN; | 1889 | p += ETH_ALEN; |
1890 | i++; | 1890 | i++; |
1891 | } | 1891 | } |