---

yaml --- r: 255471 b: refs/heads/master c: db1d350 h: refs/heads/master i: 255469: 20c72bf 255467: 800637a 255463: c7d7adc 255455: be6182b v: v3
git-mirror · Jun 9, 2011 · e57fd8b · e57fd8b
1 parent 2afc8cf
commit e57fd8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 11f23aa8ccd56786f0a6f04211cf59b3fab2ce08
+refs/heads/master: db1d350fcb156b58f66a67680617077bcacfe6fc
diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c
@@ -5342,7 +5342,7 @@ static int cnic_netdev_event(struct notifier_block *this, unsigned long event,
 
 	dev = cnic_from_netdev(netdev);
 
-	if (!dev && (event == NETDEV_REGISTER || event == NETDEV_UP)) {
+	if (!dev && (event == NETDEV_REGISTER || netif_running(netdev))) {
 		/* Check for the hot-plug device */
 		dev = is_cnic_dev(netdev);
 		if (dev) {
@@ -5358,7 +5358,7 @@ static int cnic_netdev_event(struct notifier_block *this, unsigned long event,
 		else if (event == NETDEV_UNREGISTER)
 			cnic_ulp_exit(dev);
 
-		if (event == NETDEV_UP) {
+		if (event == NETDEV_UP || (new_dev && netif_running(netdev))) {
 			if (cnic_register_netdev(dev) != 0) {
 				cnic_put(dev);
 				goto done;