aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/hw/nes/nes_nic.c
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2010-04-01 17:22:57 -0400
committerDavid S. Miller <davem@davemloft.net>2010-04-03 17:22:15 -0400
commit22bedad3ce112d5ca1eaf043d4990fa2ed698c87 (patch)
treeb6fba5688d48b1396f01d13ee53610dea7749c15 /drivers/infiniband/hw/nes/nes_nic.c
parenta748ee2426817a95b1f03012d8f339c45c722ae1 (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/infiniband/hw/nes/nes_nic.c')
-rw-r--r--drivers/infiniband/hw/nes/nes_nic.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 91fdde382e82..ce9ef6bc865c 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -876,7 +876,7 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)
876 if (!mc_all_on) { 876 if (!mc_all_on) {
877 char *addrs; 877 char *addrs;
878 int i; 878 int i;
879 struct dev_mc_list *mcaddr; 879 struct netdev_hw_addr *ha;
880 880
881 addrs = kmalloc(ETH_ALEN * mc_count, GFP_ATOMIC); 881 addrs = kmalloc(ETH_ALEN * mc_count, GFP_ATOMIC);
882 if (!addrs) { 882 if (!addrs) {
@@ -884,9 +884,8 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)
884 goto unlock; 884 goto unlock;
885 } 885 }
886 i = 0; 886 i = 0;
887 netdev_for_each_mc_addr(mcaddr, netdev) 887 netdev_for_each_mc_addr(ha, netdev)
888 memcpy(get_addr(addrs, i++), 888 memcpy(get_addr(addrs, i++), ha->addr, ETH_ALEN);
889 mcaddr->dmi_addr, ETH_ALEN);
890 889
891 perfect_filter_register_address = NES_IDX_PERFECT_FILTER_LOW + 890 perfect_filter_register_address = NES_IDX_PERFECT_FILTER_LOW +
892 pft_entries_preallocated * 0x8; 891 pft_entries_preallocated * 0x8;