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/tulip/uli526x.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/tulip/uli526x.c')
-rw-r--r-- | drivers/net/tulip/uli526x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c index 0ab05af237e5..b79d908fe34e 100644 --- a/drivers/net/tulip/uli526x.c +++ b/drivers/net/tulip/uli526x.c | |||
@@ -1392,7 +1392,7 @@ static void update_cr6(u32 cr6_data, unsigned long ioaddr) | |||
1392 | static void send_filter_frame(struct net_device *dev, int mc_cnt) | 1392 | static void send_filter_frame(struct net_device *dev, int mc_cnt) |
1393 | { | 1393 | { |
1394 | struct uli526x_board_info *db = netdev_priv(dev); | 1394 | struct uli526x_board_info *db = netdev_priv(dev); |
1395 | struct dev_mc_list *mcptr; | 1395 | struct netdev_hw_addr *ha; |
1396 | struct tx_desc *txptr; | 1396 | struct tx_desc *txptr; |
1397 | u16 * addrptr; | 1397 | u16 * addrptr; |
1398 | u32 * suptr; | 1398 | u32 * suptr; |
@@ -1415,8 +1415,8 @@ static void send_filter_frame(struct net_device *dev, int mc_cnt) | |||
1415 | *suptr++ = 0xffff << FLT_SHIFT; | 1415 | *suptr++ = 0xffff << FLT_SHIFT; |
1416 | 1416 | ||
1417 | /* fit the multicast address */ | 1417 | /* fit the multicast address */ |
1418 | netdev_for_each_mc_addr(mcptr, dev) { | 1418 | netdev_for_each_mc_addr(ha, dev) { |
1419 | addrptr = (u16 *) mcptr->dmi_addr; | 1419 | addrptr = (u16 *) ha->addr; |
1420 | *suptr++ = addrptr[0] << FLT_SHIFT; | 1420 | *suptr++ = addrptr[0] << FLT_SHIFT; |
1421 | *suptr++ = addrptr[1] << FLT_SHIFT; | 1421 | *suptr++ = addrptr[1] << FLT_SHIFT; |
1422 | *suptr++ = addrptr[2] << FLT_SHIFT; | 1422 | *suptr++ = addrptr[2] << FLT_SHIFT; |