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

[linux-2.6-microblaze.git] / drivers / s390 / net / qeth_l3_main.c

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index cfa199a..a856cb4 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -3243,13 +3243,16 @@ struct ccwgroup_driver qeth_l3_ccwgroup_driver = {
 EXPORT_SYMBOL_GPL(qeth_l3_ccwgroup_driver);
 
 static int qeth_l3_ip_event(struct notifier_block *this,
-                               unsigned long event, void *ptr)
+                           unsigned long event, void *ptr)
 {
        struct in_ifaddr *ifa = (struct in_ifaddr *)ptr;
        struct net_device *dev = (struct net_device *)ifa->ifa_dev->dev;
        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_l3_get_card_from_dev(dev);
        if (!card)
@@ -3290,7 +3293,7 @@ static struct notifier_block qeth_l3_ip_notifier = {
  * IPv6 event handler
  */
 static int qeth_l3_ip6_event(struct notifier_block *this,
-                               unsigned long event, void *ptr)
+                            unsigned long event, void *ptr)
 {
        struct inet6_ifaddr *ifa = (struct inet6_ifaddr *)ptr;
        struct net_device *dev = (struct net_device *)ifa->idev->dev;