diff options
| author | Ursula Braun <braunu@de.ibm.com> | 2007-06-20 13:01:30 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-06-21 01:12:42 +0200 |
| commit | 651bbc6224a95eb5bf0ccf6ecd61fc244b38d1f5 (patch) | |
| tree | 3fba78b80b3e80b4c41a7fc560bcc57a9c852139 | |
| parent | s390: Use ccw_device_get_id() in qeth/claw drivers (diff) | |
| download | linux-651bbc6224a95eb5bf0ccf6ecd61fc244b38d1f5.tar.xz linux-651bbc6224a95eb5bf0ccf6ecd61fc244b38d1f5.zip | |
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 <braunu@de.ibm.com>
Signed-off-by: Frank Pavlic <fpavlic@de.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/s390/net/netiucv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index c358764f3264..648ee132cda4 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++; |