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/tokenring/ibmtr.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/tokenring/ibmtr.c')
-rw-r--r-- | drivers/net/tokenring/ibmtr.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index 1a0967246e2f..eebdaae24328 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c | |||
@@ -986,7 +986,7 @@ static void open_sap(unsigned char type, struct net_device *dev) | |||
986 | static void tok_set_multicast_list(struct net_device *dev) | 986 | static void tok_set_multicast_list(struct net_device *dev) |
987 | { | 987 | { |
988 | struct tok_info *ti = netdev_priv(dev); | 988 | struct tok_info *ti = netdev_priv(dev); |
989 | struct dev_mc_list *mclist; | 989 | struct netdev_hw_addr *ha; |
990 | unsigned char address[4]; | 990 | unsigned char address[4]; |
991 | 991 | ||
992 | int i; | 992 | int i; |
@@ -995,11 +995,11 @@ static void tok_set_multicast_list(struct net_device *dev) | |||
995 | /*BMS ifconfig tr down or hot unplug a PCMCIA card ??hownowbrowncow*/ | 995 | /*BMS ifconfig tr down or hot unplug a PCMCIA card ??hownowbrowncow*/ |
996 | if (/*BMSHELPdev->start == 0 ||*/ ti->open_status != OPEN) return; | 996 | if (/*BMSHELPdev->start == 0 ||*/ ti->open_status != OPEN) return; |
997 | address[0] = address[1] = address[2] = address[3] = 0; | 997 | address[0] = address[1] = address[2] = address[3] = 0; |
998 | netdev_for_each_mc_addr(mclist, dev) { | 998 | netdev_for_each_mc_addr(ha, dev) { |
999 | address[0] |= mclist->dmi_addr[2]; | 999 | address[0] |= ha->addr[2]; |
1000 | address[1] |= mclist->dmi_addr[3]; | 1000 | address[1] |= ha->addr[3]; |
1001 | address[2] |= mclist->dmi_addr[4]; | 1001 | address[2] |= ha->addr[4]; |
1002 | address[3] |= mclist->dmi_addr[5]; | 1002 | address[3] |= ha->addr[5]; |
1003 | } | 1003 | } |
1004 | SET_PAGE(ti->srb_page); | 1004 | SET_PAGE(ti->srb_page); |
1005 | for (i = 0; i < sizeof(struct srb_set_funct_addr); i++) | 1005 | for (i = 0; i < sizeof(struct srb_set_funct_addr); i++) |