From c8b47ee52c78b44d55dd0ecb2e170916aab2299d Mon Sep 17 00:00:00 2001
From: "Denis V. Lunev" <den@openvz.org>
Date: Thu, 28 Feb 2008 20:46:17 -0800
Subject: [PATCH] --- yaml --- r: 89791 b: refs/heads/master c:
 6133fb1aa137b35a8fa91ec17977ebf6a41456ec h: refs/heads/master i:   89789:
 f1c43c46e63b6df2f71ce623932280825c70530b   89787:
 6184e92c52c41938a08796737adadafc6a6ba20f   89783:
 94ec422700dfb9b69a38024145390b5b896f3c3a   89775:
 c2052063da79ccfae6155324c6951599459f84d6   89759:
 7c0b573c0b82cd80a40910d9a03dc03d4388155e   89727:
 3a9d8d4902690dc2aaa813c958626ed87dcd120f v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/bonding/bond_main.c | 3 +++
 trunk/drivers/net/via-velocity.c      | 3 +++
 trunk/drivers/s390/net/qeth_main.c    | 3 +++
 trunk/net/sctp/protocol.c             | 3 +++
 5 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3816f7fa5d2e..82a6a7e1ed4e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6fc68624e524014fcd95faf726f855eb348f2e87
+refs/heads/master: 6133fb1aa137b35a8fa91ec17977ebf6a41456ec
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
index 0942d82f7cbf..966643473da7 100644
--- a/trunk/drivers/net/bonding/bond_main.c
+++ b/trunk/drivers/net/bonding/bond_main.c
@@ -3511,6 +3511,9 @@ static int bond_inetaddr_event(struct notifier_block *this, unsigned long event,
 	struct bonding *bond, *bond_next;
 	struct vlan_entry *vlan, *vlan_next;
 
+	if (ifa->ifa_dev->dev->nd_net != &init_net)
+		return NOTIFY_DONE;
+
 	list_for_each_entry_safe(bond, bond_next, &bond_dev_list, bond_list) {
 		if (bond->dev == event_dev) {
 			switch (event) {
diff --git a/trunk/drivers/net/via-velocity.c b/trunk/drivers/net/via-velocity.c
index c50fdeed9e85..1525e8a89844 100644
--- a/trunk/drivers/net/via-velocity.c
+++ b/trunk/drivers/net/via-velocity.c
@@ -3464,6 +3464,9 @@ static int velocity_netdev_event(struct notifier_block *nb, unsigned long notifi
 	struct velocity_info *vptr;
 	unsigned long flags;
 
+	if (dev->nd_net != &init_net)
+		return NOTIFY_DONE;
+
 	spin_lock_irqsave(&velocity_dev_list_lock, flags);
 	list_for_each_entry(vptr, &velocity_dev_list, list) {
 		if (vptr->dev == dev) {
diff --git a/trunk/drivers/s390/net/qeth_main.c b/trunk/drivers/s390/net/qeth_main.c
index 62606ce26e55..d063e9ecf804 100644
--- a/trunk/drivers/s390/net/qeth_main.c
+++ b/trunk/drivers/s390/net/qeth_main.c
@@ -8622,6 +8622,9 @@ qeth_ip_event(struct notifier_block *this,
 	struct qeth_ipaddr *addr;
 	struct qeth_card *card;
 
+	if (dev->nd_net != &init_net)
+		return NOTIFY_DONE;
+
 	QETH_DBF_TEXT(trace,3,"ipevent");
 	card = qeth_get_card_from_dev(dev);
 	if (!card)
diff --git a/trunk/net/sctp/protocol.c b/trunk/net/sctp/protocol.c
index 688546dccd82..8d9d929f6cea 100644
--- a/trunk/net/sctp/protocol.c
+++ b/trunk/net/sctp/protocol.c
@@ -629,6 +629,9 @@ static int sctp_inetaddr_event(struct notifier_block *this, unsigned long ev,
 	struct sctp_sockaddr_entry *addr = NULL;
 	struct sctp_sockaddr_entry *temp;
 
+	if (ifa->ifa_dev->dev->nd_net != &init_net)
+		return NOTIFY_DONE;
+
 	switch (ev) {
 	case NETDEV_UP:
 		addr = kmalloc(sizeof(struct sctp_sockaddr_entry), GFP_ATOMIC);