From 20aff74d49999bde5ef3a1b6fedc5eac1a57d043 Mon Sep 17 00:00:00 2001 From: Andy Gospodarek Date: Wed, 9 Apr 2008 13:27:29 -0400 Subject: [PATCH] Adding hunk that got missed from this upstream commit: commit c2edacf80e155ef54ae4774379d461b60896bc2e Author: Jay Vosburgh Date: Mon Jul 9 10:42:47 2007 -0700 bonding / ipv6: no addrconf for slaves separately from master This will resolve BZ 236750. --- net/ipv6/addrconf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index ab7c344..f0b176a 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2268,6 +2268,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, switch(event) { case NETDEV_UP: case NETDEV_CHANGE: + if (dev->flags & IFF_SLAVE) + break; + if (event == NETDEV_UP) { if (!netif_carrier_ok(dev)) { /* device is not ready yet. */ -- 1.5.2.1