1 files changed, 6 insertions, 5 deletions

diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c
index 966de5d69521..ba1de5973fb2 100644
--- a/drivers/net/iseries_veth.c
+++ b/drivers/net/iseries_veth.c
@@ -69,6 +69,7 @@
 #include <linux/mm.h>
 #include <linux/ethtool.h>
 #include <linux/if_ether.h>
+#include <linux/slab.h>
 
 #include <asm/abs_addr.h>
 #include <asm/iseries/mf.h>
@@ -384,7 +385,7 @@ static struct attribute *veth_cnx_default_attrs[] = {
         NULL
 };
 
-static struct sysfs_ops veth_cnx_sysfs_ops = {
+static const struct sysfs_ops veth_cnx_sysfs_ops = {
                 .show = veth_cnx_attribute_show
 };
 
@@ -441,7 +442,7 @@ static struct attribute *veth_port_default_attrs[] = {
         NULL
 };
 
-static struct sysfs_ops veth_port_sysfs_ops = {
+static const struct sysfs_ops veth_port_sysfs_ops = {
         .show = veth_port_attribute_show
 };
 
@@ -961,15 +962,15 @@ static void veth_set_multicast_list(struct net_device *dev)
                         (netdev_mc_count(dev) > VETH_MAX_MCAST)) {
                 port->promiscuous = 1;
         } else {
-                struct dev_mc_list *dmi;
+                struct netdev_hw_addr *ha;
 
                 port->promiscuous = 0;
 
                 /* Update table */
                 port->num_mcast = 0;
 
-                netdev_for_each_mc_addr(dmi, dev) {
-                        u8 *addr = dmi->dmi_addr;
+                netdev_for_each_mc_addr(ha, dev) {
+                        u8 *addr = ha->addr;
                         u64 xaddr = 0;
 
                         if (addr[0] & 0x01) {/* multicast address? */