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/lanstreamer.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/lanstreamer.c')
-rw-r--r-- | drivers/net/tokenring/lanstreamer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index 01c780f25e98..88c893100c2b 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
@@ -1266,7 +1266,7 @@ static void streamer_set_rx_mode(struct net_device *dev) | |||
1266 | netdev_priv(dev); | 1266 | netdev_priv(dev); |
1267 | __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio; | 1267 | __u8 __iomem *streamer_mmio = streamer_priv->streamer_mmio; |
1268 | __u8 options = 0; | 1268 | __u8 options = 0; |
1269 | struct dev_mc_list *dmi; | 1269 | struct netdev_hw_addr *ha; |
1270 | unsigned char dev_mc_address[5]; | 1270 | unsigned char dev_mc_address[5]; |
1271 | 1271 | ||
1272 | writel(streamer_priv->srb, streamer_mmio + LAPA); | 1272 | writel(streamer_priv->srb, streamer_mmio + LAPA); |
@@ -1302,11 +1302,11 @@ static void streamer_set_rx_mode(struct net_device *dev) | |||
1302 | writel(streamer_priv->srb,streamer_mmio+LAPA); | 1302 | writel(streamer_priv->srb,streamer_mmio+LAPA); |
1303 | dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ; | 1303 | dev_mc_address[0] = dev_mc_address[1] = dev_mc_address[2] = dev_mc_address[3] = 0 ; |
1304 | 1304 | ||
1305 | netdev_for_each_mc_addr(dmi, dev) { | 1305 | netdev_for_each_mc_addr(ha, dev) { |
1306 | dev_mc_address[0] |= dmi->dmi_addr[2] ; | 1306 | dev_mc_address[0] |= ha->addr[2]; |
1307 | dev_mc_address[1] |= dmi->dmi_addr[3] ; | 1307 | dev_mc_address[1] |= ha->addr[3]; |
1308 | dev_mc_address[2] |= dmi->dmi_addr[4] ; | 1308 | dev_mc_address[2] |= ha->addr[4]; |
1309 | dev_mc_address[3] |= dmi->dmi_addr[5] ; | 1309 | dev_mc_address[3] |= ha->addr[5]; |
1310 | } | 1310 | } |
1311 | 1311 | ||
1312 | writew(htons(SRB_SET_FUNC_ADDRESS << 8),streamer_mmio+LAPDINC); | 1312 | writew(htons(SRB_SET_FUNC_ADDRESS << 8),streamer_mmio+LAPDINC); |