From c192b1a805e2c2c58aeb5956c8c670a25dbde44e Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Fri, 2 Oct 2009 05:15:27 +0000
Subject: [PATCH] --- yaml --- r: 170425 b: refs/heads/master c:
 7ffbe3fdace0bdfcdab8dc6c77506feda0871f79 h: refs/heads/master i:   170423:
 cbd53da6808eadcdf8209914eb320612cef9ae18 v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/notifier.h | 1 +
 trunk/net/core/dev.c           | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7ec859f5478a..f57e4ea13f3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 225794f8c33fd32721ae1cd3576db99810351d7b
+refs/heads/master: 7ffbe3fdace0bdfcdab8dc6c77506feda0871f79
diff --git a/trunk/include/linux/notifier.h b/trunk/include/linux/notifier.h
index 44428d247dbe..29714b8441b1 100644
--- a/trunk/include/linux/notifier.h
+++ b/trunk/include/linux/notifier.h
@@ -201,6 +201,7 @@ static inline int notifier_to_errno(int ret)
 #define NETDEV_PRE_UP		0x000D
 #define NETDEV_BONDING_OLDTYPE  0x000E
 #define NETDEV_BONDING_NEWTYPE  0x000F
+#define NETDEV_POST_INIT	0x0010
 
 #define SYS_DOWN	0x0001	/* Notify of system down */
 #define SYS_RESTART	SYS_DOWN
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index b8f74cfb1bfd..a74c8fd69556 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -4836,6 +4836,12 @@ int register_netdevice(struct net_device *dev)
 		dev->features |= NETIF_F_GSO;
 
 	netdev_initialize_kobject(dev);
+
+	ret = call_netdevice_notifiers(NETDEV_POST_INIT, dev);
+	ret = notifier_to_errno(ret);
+	if (ret)
+		goto err_uninit;
+
 	ret = netdev_register_kobject(dev);
 	if (ret)
 		goto err_uninit;