Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[net-next-2.6.git] / drivers / net / myri10ge / myri10ge.c

diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index ecde0876a78583fc8c4e063875be3e4975015d52..72b4b19e14e7275b4252eadb192f95ded9faf6e5 100644 (file)
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -3002,7 +3002,7 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
 {
        struct myri10ge_priv *mgp = netdev_priv(dev);
        struct myri10ge_cmd cmd;
-       struct dev_mc_list *mc_list;
+       struct netdev_hw_addr *ha;
        __be32 data[2] = { 0, 0 };
        int err;
 
@@ -3039,8 +3039,8 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
        }
 
        /* Walk the multicast list, and add each address */
-       netdev_for_each_mc_addr(mc_list, dev) {
-               memcpy(data, &mc_list->dmi_addr, 6);
+       netdev_for_each_mc_addr(ha, dev) {
+               memcpy(data, &ha->addr, 6);
                cmd.data0 = ntohl(data[0]);
                cmd.data1 = ntohl(data[1]);
                err = myri10ge_send_cmd(mgp, MXGEFW_JOIN_MULTICAST_GROUP,
@@ -3048,7 +3048,7 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
 
                if (err != 0) {
                        netdev_err(dev, "Failed MXGEFW_JOIN_MULTICAST_GROUP, error status:%d %pM\n",
-                                  err, mc_list->dmi_addr);
+                                  err, ha->addr);
                        goto abort;
                }
        }