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/r6040.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/r6040.c')
-rw-r--r-- | drivers/net/r6040.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 15d5373dc8f3..f5a0e963e688 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c | |||
@@ -938,7 +938,7 @@ static void r6040_multicast_list(struct net_device *dev) | |||
938 | u16 *adrp; | 938 | u16 *adrp; |
939 | u16 reg; | 939 | u16 reg; |
940 | unsigned long flags; | 940 | unsigned long flags; |
941 | struct dev_mc_list *dmi; | 941 | struct netdev_hw_addr *ha; |
942 | int i; | 942 | int i; |
943 | 943 | ||
944 | /* MAC Address */ | 944 | /* MAC Address */ |
@@ -973,8 +973,8 @@ static void r6040_multicast_list(struct net_device *dev) | |||
973 | for (i = 0; i < 4; i++) | 973 | for (i = 0; i < 4; i++) |
974 | hash_table[i] = 0; | 974 | hash_table[i] = 0; |
975 | 975 | ||
976 | netdev_for_each_mc_addr(dmi, dev) { | 976 | netdev_for_each_mc_addr(ha, dev) { |
977 | char *addrs = dmi->dmi_addr; | 977 | char *addrs = ha->addr; |
978 | 978 | ||
979 | if (!(*addrs & 1)) | 979 | if (!(*addrs & 1)) |
980 | continue; | 980 | continue; |
@@ -994,9 +994,9 @@ static void r6040_multicast_list(struct net_device *dev) | |||
994 | } | 994 | } |
995 | /* Multicast Address 1~4 case */ | 995 | /* Multicast Address 1~4 case */ |
996 | i = 0; | 996 | i = 0; |
997 | netdev_for_each_mc_addr(dmi, dev) { | 997 | netdev_for_each_mc_addr(ha, dev) { |
998 | if (i < MCAST_MAX) { | 998 | if (i < MCAST_MAX) { |
999 | adrp = (u16 *) dmi->dmi_addr; | 999 | adrp = (u16 *) ha->addr; |
1000 | iowrite16(adrp[0], ioaddr + MID_1L + 8 * i); | 1000 | iowrite16(adrp[0], ioaddr + MID_1L + 8 * i); |
1001 | iowrite16(adrp[1], ioaddr + MID_1M + 8 * i); | 1001 | iowrite16(adrp[1], ioaddr + MID_1M + 8 * i); |
1002 | iowrite16(adrp[2], ioaddr + MID_1H + 8 * i); | 1002 | iowrite16(adrp[2], ioaddr + MID_1H + 8 * i); |