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/defxx.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/defxx.c')
-rw-r--r-- | drivers/net/defxx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/defxx.c b/drivers/net/defxx.c index ed53a8d45f4e..e5667c55844e 100644 --- a/drivers/net/defxx.c +++ b/drivers/net/defxx.c | |||
@@ -2195,7 +2195,7 @@ static void dfx_ctl_set_multicast_list(struct net_device *dev) | |||
2195 | { | 2195 | { |
2196 | DFX_board_t *bp = netdev_priv(dev); | 2196 | DFX_board_t *bp = netdev_priv(dev); |
2197 | int i; /* used as index in for loop */ | 2197 | int i; /* used as index in for loop */ |
2198 | struct dev_mc_list *dmi; /* ptr to multicast addr entry */ | 2198 | struct netdev_hw_addr *ha; |
2199 | 2199 | ||
2200 | /* Enable LLC frame promiscuous mode, if necessary */ | 2200 | /* Enable LLC frame promiscuous mode, if necessary */ |
2201 | 2201 | ||
@@ -2241,9 +2241,9 @@ static void dfx_ctl_set_multicast_list(struct net_device *dev) | |||
2241 | /* Copy addresses to multicast address table, then update adapter CAM */ | 2241 | /* Copy addresses to multicast address table, then update adapter CAM */ |
2242 | 2242 | ||
2243 | i = 0; | 2243 | i = 0; |
2244 | netdev_for_each_mc_addr(dmi, dev) | 2244 | netdev_for_each_mc_addr(ha, dev) |
2245 | memcpy(&bp->mc_table[i++ * FDDI_K_ALEN], | 2245 | memcpy(&bp->mc_table[i++ * FDDI_K_ALEN], |
2246 | dmi->dmi_addr, FDDI_K_ALEN); | 2246 | ha->addr, FDDI_K_ALEN); |
2247 | 2247 | ||
2248 | if (dfx_ctl_update_cam(bp) != DFX_K_SUCCESS) | 2248 | if (dfx_ctl_update_cam(bp) != DFX_K_SUCCESS) |
2249 | { | 2249 | { |