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/tokenring/olympic.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/tokenring/olympic.c')
-rw-r--r-- | drivers/net/tokenring/olympic.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c index 3decaf4b6cf2..3d2fbe60b46e 100644 --- a/drivers/net/tokenring/olympic.c +++ b/drivers/net/tokenring/olympic.c | |||
@@ -1139,7 +1139,7 @@ static void olympic_set_rx_mode(struct net_device *dev) | |||
1139 | u8 __iomem *olympic_mmio = olympic_priv->olympic_mmio ; | 1139 | u8 __iomem *olympic_mmio = olympic_priv->olympic_mmio ; |
1140 | u8 options = 0; | 1140 | u8 options = 0; |
1141 | u8 __iomem *srb; | 1141 | u8 __iomem *srb; |
1142 | struct dev_mc_list *dmi; | 1142 | struct netdev_hw_addr *ha; |
1143 | unsigned char dev_mc_address[4] ; | 1143 | unsigned char dev_mc_address[4] ; |
1144 | 1144 | ||
1145 | writel(olympic_priv->srb,olympic_mmio+LAPA); | 1145 | writel(olympic_priv->srb,olympic_mmio+LAPA); |
@@ -1177,11 +1177,11 @@ static void olympic_set_rx_mode(struct net_device *dev) | |||
1177 | 1177 | ||
1178 | dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ; | 1178 | dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ; |
1179 | 1179 | ||
1180 | netdev_for_each_mc_addr(dmi, dev) { | 1180 | netdev_for_each_mc_addr(ha, dev) { |
1181 | dev_mc_address[0] |= dmi->dmi_addr[2] ; | 1181 | dev_mc_address[0] |= ha->addr[2]; |
1182 | dev_mc_address[1] |= dmi->dmi_addr[3] ; | 1182 | dev_mc_address[1] |= ha->addr[3]; |
1183 | dev_mc_address[2] |= dmi->dmi_addr[4] ; | 1183 | dev_mc_address[2] |= ha->addr[4]; |
1184 | dev_mc_address[3] |= dmi->dmi_addr[5] ; | 1184 | dev_mc_address[3] |= ha->addr[5]; |
1185 | } | 1185 | } |
1186 | 1186 | ||
1187 | writeb(SRB_SET_FUNC_ADDRESS,srb+0); | 1187 | writeb(SRB_SET_FUNC_ADDRESS,srb+0); |