From e11deef9fddde9fad6bd6df22ed6a2a43c5e4691 Mon Sep 17 00:00:00 2001
From: Ursula Braun <braunu@de.ibm.com>
Date: Wed, 20 Jun 2007 13:01:30 +0200
Subject: [PATCH] --- yaml --- r: 57920 b: refs/heads/master c:
 651bbc6224a95eb5bf0ccf6ecd61fc244b38d1f5 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/s390/net/netiucv.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7194d82828cd..56f448f72928 100644
--- 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
index c358764f3264..648ee132cda4 100644
--- 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++;