diff options
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r-- | drivers/net/gianfar.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index b6715553cf17..fdd26c2b1a2f 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -2797,7 +2797,7 @@ static void adjust_link(struct net_device *dev) | |||
2797 | * whenever dev->flags is changed */ | 2797 | * whenever dev->flags is changed */ |
2798 | static void gfar_set_multi(struct net_device *dev) | 2798 | static void gfar_set_multi(struct net_device *dev) |
2799 | { | 2799 | { |
2800 | struct dev_mc_list *mc_ptr; | 2800 | struct netdev_hw_addr *ha; |
2801 | struct gfar_private *priv = netdev_priv(dev); | 2801 | struct gfar_private *priv = netdev_priv(dev); |
2802 | struct gfar __iomem *regs = priv->gfargrp[0].regs; | 2802 | struct gfar __iomem *regs = priv->gfargrp[0].regs; |
2803 | u32 tempval; | 2803 | u32 tempval; |
@@ -2870,13 +2870,12 @@ static void gfar_set_multi(struct net_device *dev) | |||
2870 | return; | 2870 | return; |
2871 | 2871 | ||
2872 | /* Parse the list, and set the appropriate bits */ | 2872 | /* Parse the list, and set the appropriate bits */ |
2873 | netdev_for_each_mc_addr(mc_ptr, dev) { | 2873 | netdev_for_each_mc_addr(ha, dev) { |
2874 | if (idx < em_num) { | 2874 | if (idx < em_num) { |
2875 | gfar_set_mac_for_addr(dev, idx, | 2875 | gfar_set_mac_for_addr(dev, idx, ha->addr); |
2876 | mc_ptr->dmi_addr); | ||
2877 | idx++; | 2876 | idx++; |
2878 | } else | 2877 | } else |
2879 | gfar_set_hash_for_addr(dev, mc_ptr->dmi_addr); | 2878 | gfar_set_hash_for_addr(dev, ha->addr); |
2880 | } | 2879 | } |
2881 | } | 2880 | } |
2882 | 2881 | ||