[NAPI]: Set SCHED before dev->open, clear if fails. Restore netif_running...

[NAPI]: Set SCHED before dev->open, clear if fails.  Restore netif_running check to netif_rx_schedule_prep.

include/linux/netdevice.h

@@ -711,7 +711,8 @@ enum {
 
 static inline int netif_rx_schedule_prep(struct net_device *dev)
 {
-	return !test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state);
+	return netif_running(dev) &&
+		!test_and_set_bit(__LINK_STATE_RX_SCHED, &dev->state);
 }
 
 /* Add interface to tail of rx poll list. This assumes that _prep has

net/core/dev.c

@@ -694,11 +694,15 @@ int dev_open(struct net_device *dev)
 	 *	Call device private open method
 	 */
 	if (try_inc_mod_count(dev->owner)) {
+		set_bit(__LINK_STATE_START, &dev->state);
 		if (dev->open) {
 			ret = dev->open(dev);
-			if (ret && dev->owner)
+			if (ret) {
+				clear_bit(__LINK_STATE_START, &dev->state);
+				if (dev->owner)
 					__MOD_DEC_USE_COUNT(dev->owner);
 			}
+		}
 	} else {
 		ret = -ENODEV;
 	}
@@ -713,8 +717,6 @@ int dev_open(struct net_device *dev)
 		 */
 		dev->flags |= IFF_UP;
 
-		set_bit(__LINK_STATE_START, &dev->state);
-
 		/*
 		 *	Initialize multicasting status
 		 */