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/infiniband/ulp | |
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/infiniband/ulp')
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index 19eba3c877cb..c8a0f7dab5b0 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c | |||
@@ -783,7 +783,7 @@ void ipoib_mcast_restart_task(struct work_struct *work) | |||
783 | struct ipoib_dev_priv *priv = | 783 | struct ipoib_dev_priv *priv = |
784 | container_of(work, struct ipoib_dev_priv, restart_task); | 784 | container_of(work, struct ipoib_dev_priv, restart_task); |
785 | struct net_device *dev = priv->dev; | 785 | struct net_device *dev = priv->dev; |
786 | struct dev_mc_list *mclist; | 786 | struct netdev_hw_addr *ha; |
787 | struct ipoib_mcast *mcast, *tmcast; | 787 | struct ipoib_mcast *mcast, *tmcast; |
788 | LIST_HEAD(remove_list); | 788 | LIST_HEAD(remove_list); |
789 | unsigned long flags; | 789 | unsigned long flags; |
@@ -808,14 +808,13 @@ void ipoib_mcast_restart_task(struct work_struct *work) | |||
808 | clear_bit(IPOIB_MCAST_FLAG_FOUND, &mcast->flags); | 808 | clear_bit(IPOIB_MCAST_FLAG_FOUND, &mcast->flags); |
809 | 809 | ||
810 | /* Mark all of the entries that are found or don't exist */ | 810 | /* Mark all of the entries that are found or don't exist */ |
811 | netdev_for_each_mc_addr(mclist, dev) { | 811 | netdev_for_each_mc_addr(ha, dev) { |
812 | union ib_gid mgid; | 812 | union ib_gid mgid; |
813 | 813 | ||
814 | if (!ipoib_mcast_addr_is_valid(mclist->dmi_addr, | 814 | if (!ipoib_mcast_addr_is_valid(ha->addr, dev->broadcast)) |
815 | dev->broadcast)) | ||
816 | continue; | 815 | continue; |
817 | 816 | ||
818 | memcpy(mgid.raw, mclist->dmi_addr + 4, sizeof mgid); | 817 | memcpy(mgid.raw, ha->addr + 4, sizeof mgid); |
819 | 818 | ||
820 | mcast = __ipoib_mcast_find(dev, &mgid); | 819 | mcast = __ipoib_mcast_find(dev, &mgid); |
821 | if (!mcast || test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) { | 820 | if (!mcast || test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) { |