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