diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2010-02-27 02:35:45 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 04:44:01 -0500 |
| commit | 655ffee284dfcf9a24ac0343f3e5ee6db85b85c5 (patch) | |
| tree | 83ac4727338e0565baae5bbe9ac8dfa57c69c545 /drivers/net/wireless/ray_cs.c | |
| parent | 9675478bbafed08848bf8d7e28400d5e46330b23 (diff) | |
wireless: convert to use netdev_for_each_mc_addr
also added missed locking in rndis_wlan.c
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ray_cs.c')
| -rw-r--r-- | drivers/net/wireless/ray_cs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 85905cab4f16..84c530aa52f9 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
| @@ -1871,10 +1871,8 @@ static void ray_update_parm(struct net_device *dev, UCHAR objid, UCHAR *value, | |||
| 1871 | /*===========================================================================*/ | 1871 | /*===========================================================================*/ |
| 1872 | static void ray_update_multi_list(struct net_device *dev, int all) | 1872 | static void ray_update_multi_list(struct net_device *dev, int all) |
| 1873 | { | 1873 | { |
| 1874 | struct dev_mc_list *dmi, **dmip; | ||
| 1875 | int ccsindex; | 1874 | int ccsindex; |
| 1876 | struct ccs __iomem *pccs; | 1875 | struct ccs __iomem *pccs; |
| 1877 | int i = 0; | ||
| 1878 | ray_dev_t *local = netdev_priv(dev); | 1876 | ray_dev_t *local = netdev_priv(dev); |
| 1879 | struct pcmcia_device *link = local->finder; | 1877 | struct pcmcia_device *link = local->finder; |
| 1880 | void __iomem *p = local->sram + HOST_TO_ECF_BASE; | 1878 | void __iomem *p = local->sram + HOST_TO_ECF_BASE; |
| @@ -1895,9 +1893,11 @@ static void ray_update_multi_list(struct net_device *dev, int all) | |||
| 1895 | writeb(0xff, &pccs->var); | 1893 | writeb(0xff, &pccs->var); |
| 1896 | local->num_multi = 0xff; | 1894 | local->num_multi = 0xff; |
| 1897 | } else { | 1895 | } else { |
| 1896 | struct dev_mc_list *dmi; | ||
| 1897 | int i = 0; | ||
| 1898 | |||
| 1898 | /* Copy the kernel's list of MC addresses to card */ | 1899 | /* Copy the kernel's list of MC addresses to card */ |
| 1899 | for (dmip = &dev->mc_list; (dmi = *dmip) != NULL; | 1900 | netdev_for_each_mc_addr(dmi, dev) { |
| 1900 | dmip = &dmi->next) { | ||
| 1901 | memcpy_toio(p, dmi->dmi_addr, ETH_ALEN); | 1901 | memcpy_toio(p, dmi->dmi_addr, ETH_ALEN); |
| 1902 | dev_dbg(&link->dev, | 1902 | dev_dbg(&link->dev, |
| 1903 | "ray_update_multi add addr %02x%02x%02x%02x%02x%02x\n", | 1903 | "ray_update_multi add addr %02x%02x%02x%02x%02x%02x\n", |
