---

yaml --- r: 57920 b: refs/heads/master c: 651bbc6 h: refs/heads/master v: v3
git-mirror · Jun 20, 2007 · e11deef · e11deef
1 parent 1c32185
commit e11deef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc5bc0cabd1003b4fa358f0d54dfdc46585efb57
+refs/heads/master: 651bbc6224a95eb5bf0ccf6ecd61fc244b38d1f5
diff --git a/trunk/drivers/s390/net/netiucv.c b/trunk/drivers/s390/net/netiucv.c
@@ -1315,7 +1315,8 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev)
 	 * and throw away packet.
 	 */
 	if (fsm_getstate(privptr->fsm) != DEV_STATE_RUNNING) {
-		fsm_event(privptr->fsm, DEV_EVENT_START, dev);
+		if (!in_atomic())
+			fsm_event(privptr->fsm, DEV_EVENT_START, dev);
 		dev_kfree_skb(skb);
 		privptr->stats.tx_dropped++;
 		privptr->stats.tx_errors++;