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/tehuti.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/tehuti.c')
-rw-r--r-- | drivers/net/tehuti.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tehuti.c b/drivers/net/tehuti.c index 068a47174fca..a38aede5c8d6 100644 --- a/drivers/net/tehuti.c +++ b/drivers/net/tehuti.c | |||
@@ -808,7 +808,7 @@ static void bdx_setmulti(struct net_device *ndev) | |||
808 | WRITE_REG(priv, regRX_MCST_HASH0 + i * 4, ~0); | 808 | WRITE_REG(priv, regRX_MCST_HASH0 + i * 4, ~0); |
809 | } else if (!netdev_mc_empty(ndev)) { | 809 | } else if (!netdev_mc_empty(ndev)) { |
810 | u8 hash; | 810 | u8 hash; |
811 | struct dev_mc_list *mclist; | 811 | struct netdev_hw_addr *ha; |
812 | u32 reg, val; | 812 | u32 reg, val; |
813 | 813 | ||
814 | /* set IMF to deny all multicast frames */ | 814 | /* set IMF to deny all multicast frames */ |
@@ -825,10 +825,10 @@ static void bdx_setmulti(struct net_device *ndev) | |||
825 | * into RX_MAC_MCST regs. we skip this phase now and accept ALL | 825 | * into RX_MAC_MCST regs. we skip this phase now and accept ALL |
826 | * multicast frames throu IMF */ | 826 | * multicast frames throu IMF */ |
827 | /* accept the rest of addresses throu IMF */ | 827 | /* accept the rest of addresses throu IMF */ |
828 | netdev_for_each_mc_addr(mclist, ndev) { | 828 | netdev_for_each_mc_addr(ha, ndev) { |
829 | hash = 0; | 829 | hash = 0; |
830 | for (i = 0; i < ETH_ALEN; i++) | 830 | for (i = 0; i < ETH_ALEN; i++) |
831 | hash ^= mclist->dmi_addr[i]; | 831 | hash ^= ha->addr[i]; |
832 | reg = regRX_MCST_HASH0 + ((hash >> 5) << 2); | 832 | reg = regRX_MCST_HASH0 + ((hash >> 5) << 2); |
833 | val = READ_REG(priv, reg); | 833 | val = READ_REG(priv, reg); |
834 | val |= (1 << (hash % 32)); | 834 | val |= (1 << (hash % 32)); |