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>
This commit is contained in:
committed by
David S. Miller
parent
a748ee2426
commit
22bedad3ce
+5
-5
@@ -938,7 +938,7 @@ static void r6040_multicast_list(struct net_device *dev)
|
||||
u16 *adrp;
|
||||
u16 reg;
|
||||
unsigned long flags;
|
||||
struct dev_mc_list *dmi;
|
||||
struct netdev_hw_addr *ha;
|
||||
int i;
|
||||
|
||||
/* MAC Address */
|
||||
@@ -973,8 +973,8 @@ static void r6040_multicast_list(struct net_device *dev)
|
||||
for (i = 0; i < 4; i++)
|
||||
hash_table[i] = 0;
|
||||
|
||||
netdev_for_each_mc_addr(dmi, dev) {
|
||||
char *addrs = dmi->dmi_addr;
|
||||
netdev_for_each_mc_addr(ha, dev) {
|
||||
char *addrs = ha->addr;
|
||||
|
||||
if (!(*addrs & 1))
|
||||
continue;
|
||||
@@ -994,9 +994,9 @@ static void r6040_multicast_list(struct net_device *dev)
|
||||
}
|
||||
/* Multicast Address 1~4 case */
|
||||
i = 0;
|
||||
netdev_for_each_mc_addr(dmi, dev) {
|
||||
netdev_for_each_mc_addr(ha, dev) {
|
||||
if (i < MCAST_MAX) {
|
||||
adrp = (u16 *) dmi->dmi_addr;
|
||||
adrp = (u16 *) ha->addr;
|
||||
iowrite16(adrp[0], ioaddr + MID_1L + 8 * i);
|
||||
iowrite16(adrp[1], ioaddr + MID_1M + 8 * i);
|
||||
iowrite16(adrp[2], ioaddr + MID_1H + 8 * i);
|
||||
|
||||
Reference in New Issue
Block a user