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

[linux-2.6-omap-h63xx.git] / drivers / infiniband / hw / amso1100 / c2.c

diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c
index 58bc272bd407273d18416c00afb35a9e51c086d2..0aecea67f3e69cb6339dfe5d6f29679eb36285e7 100644 (file)
--- a/drivers/infiniband/hw/amso1100/c2.c
+++ b/drivers/infiniband/hw/amso1100/c2.c
@@ -672,7 +672,7 @@ static int c2_up(struct net_device *netdev)
         * rdma interface.
         */
        in_dev = in_dev_get(netdev);
-       in_dev->cnf.arp_ignore = 1;
+       IN_DEV_CONF_SET(in_dev, ARP_IGNORE, 1);
        in_dev_put(in_dev);
 
        return 0;