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/fs_enet | |
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/fs_enet')
-rw-r--r-- | drivers/net/fs_enet/mac-fcc.c | 6 | ||||
-rw-r--r-- | drivers/net/fs_enet/mac-fec.c | 6 | ||||
-rw-r--r-- | drivers/net/fs_enet/mac-scc.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c index cf4f674f9e2e..b3bad7c15d02 100644 --- a/drivers/net/fs_enet/mac-fcc.c +++ b/drivers/net/fs_enet/mac-fcc.c | |||
@@ -231,12 +231,12 @@ static void set_multicast_finish(struct net_device *dev) | |||
231 | 231 | ||
232 | static void set_multicast_list(struct net_device *dev) | 232 | static void set_multicast_list(struct net_device *dev) |
233 | { | 233 | { |
234 | struct dev_mc_list *pmc; | 234 | struct netdev_hw_addr *ha; |
235 | 235 | ||
236 | if ((dev->flags & IFF_PROMISC) == 0) { | 236 | if ((dev->flags & IFF_PROMISC) == 0) { |
237 | set_multicast_start(dev); | 237 | set_multicast_start(dev); |
238 | netdev_for_each_mc_addr(pmc, dev) | 238 | netdev_for_each_mc_addr(ha, dev) |
239 | set_multicast_one(dev, pmc->dmi_addr); | 239 | set_multicast_one(dev, ha->addr); |
240 | set_multicast_finish(dev); | 240 | set_multicast_finish(dev); |
241 | } else | 241 | } else |
242 | set_promiscuous_mode(dev); | 242 | set_promiscuous_mode(dev); |
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c index cd2c6cca5f24..75974c6d201b 100644 --- a/drivers/net/fs_enet/mac-fec.c +++ b/drivers/net/fs_enet/mac-fec.c | |||
@@ -232,12 +232,12 @@ static void set_multicast_finish(struct net_device *dev) | |||
232 | 232 | ||
233 | static void set_multicast_list(struct net_device *dev) | 233 | static void set_multicast_list(struct net_device *dev) |
234 | { | 234 | { |
235 | struct dev_mc_list *pmc; | 235 | struct netdev_hw_addr *ha; |
236 | 236 | ||
237 | if ((dev->flags & IFF_PROMISC) == 0) { | 237 | if ((dev->flags & IFF_PROMISC) == 0) { |
238 | set_multicast_start(dev); | 238 | set_multicast_start(dev); |
239 | netdev_for_each_mc_addr(pmc, dev) | 239 | netdev_for_each_mc_addr(ha, dev) |
240 | set_multicast_one(dev, pmc->dmi_addr); | 240 | set_multicast_one(dev, ha->addr); |
241 | set_multicast_finish(dev); | 241 | set_multicast_finish(dev); |
242 | } else | 242 | } else |
243 | set_promiscuous_mode(dev); | 243 | set_promiscuous_mode(dev); |
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c index c490a466cae1..0ab6a346a193 100644 --- a/drivers/net/fs_enet/mac-scc.c +++ b/drivers/net/fs_enet/mac-scc.c | |||
@@ -224,12 +224,12 @@ static void set_multicast_finish(struct net_device *dev) | |||
224 | 224 | ||
225 | static void set_multicast_list(struct net_device *dev) | 225 | static void set_multicast_list(struct net_device *dev) |
226 | { | 226 | { |
227 | struct dev_mc_list *pmc; | 227 | struct netdev_hw_addr *ha; |
228 | 228 | ||
229 | if ((dev->flags & IFF_PROMISC) == 0) { | 229 | if ((dev->flags & IFF_PROMISC) == 0) { |
230 | set_multicast_start(dev); | 230 | set_multicast_start(dev); |
231 | netdev_for_each_mc_addr(pmc, dev) | 231 | netdev_for_each_mc_addr(ha, dev) |
232 | set_multicast_one(dev, pmc->dmi_addr); | 232 | set_multicast_one(dev, ha->addr); |
233 | set_multicast_finish(dev); | 233 | set_multicast_finish(dev); |
234 | } else | 234 | } else |
235 | set_promiscuous_mode(dev); | 235 | set_promiscuous_mode(dev); |