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/wireless/rndis_wlan.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/wireless/rndis_wlan.c')
-rw-r--r-- | drivers/net/wireless/rndis_wlan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index aceb95ef7274..8ab9f094747b 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
@@ -1545,7 +1545,7 @@ static int remove_key(struct usbnet *usbdev, int index, const u8 *bssid) | |||
1545 | static void set_multicast_list(struct usbnet *usbdev) | 1545 | static void set_multicast_list(struct usbnet *usbdev) |
1546 | { | 1546 | { |
1547 | struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev); | 1547 | struct rndis_wlan_private *priv = get_rndis_wlan_priv(usbdev); |
1548 | struct dev_mc_list *mclist; | 1548 | struct netdev_hw_addr *ha; |
1549 | __le32 filter, basefilter; | 1549 | __le32 filter, basefilter; |
1550 | int ret; | 1550 | int ret; |
1551 | char *mc_addrs = NULL; | 1551 | char *mc_addrs = NULL; |
@@ -1584,9 +1584,9 @@ static void set_multicast_list(struct usbnet *usbdev) | |||
1584 | return; | 1584 | return; |
1585 | } | 1585 | } |
1586 | 1586 | ||
1587 | netdev_for_each_mc_addr(mclist, usbdev->net) | 1587 | netdev_for_each_mc_addr(ha, usbdev->net) |
1588 | memcpy(mc_addrs + i++ * ETH_ALEN, | 1588 | memcpy(mc_addrs + i++ * ETH_ALEN, |
1589 | mclist->dmi_addr, ETH_ALEN); | 1589 | ha->addr, ETH_ALEN); |
1590 | } | 1590 | } |
1591 | netif_addr_unlock_bh(usbdev->net); | 1591 | netif_addr_unlock_bh(usbdev->net); |
1592 | 1592 | ||