From: Ursula Braun Date: Wed, 20 Jun 2007 11:01:30 +0000 (+0200) Subject: s390: don't call iucv_path_connect from tasklet context X-Git-Tag: v2.6.22-rc6~55 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=651bbc6224a95eb5bf0ccf6ecd61fc244b38d1f5;p=linux-2.6 s390: don't call iucv_path_connect from tasklet context net/iucv/iucv.c creates the requirement for iucv_path_connect not to be called from tasklet context anymore. An extra checking is added in case of a failing netiucv_tx to fulfil this requirement for netiucv. Signed-off-by: Ursula Braun Signed-off-by: Frank Pavlic Signed-off-by: Jeff Garzik --- diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index c358764f32..648ee132cd 100644 --- a/drivers/s390/net/netiucv.c +++ b/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++;