diff options
Diffstat (limited to 'drivers/s390/net/ctcm_fsms.c')
-rw-r--r-- | drivers/s390/net/ctcm_fsms.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/s390/net/ctcm_fsms.c b/drivers/s390/net/ctcm_fsms.c index fb92524d24e..2d602207541 100644 --- a/drivers/s390/net/ctcm_fsms.c +++ b/drivers/s390/net/ctcm_fsms.c | |||
@@ -1,4 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * drivers/s390/net/ctcm_fsms.c | ||
3 | * | ||
2 | * Copyright IBM Corp. 2001, 2007 | 4 | * Copyright IBM Corp. 2001, 2007 |
3 | * Authors: Fritz Elfert (felfert@millenux.com) | 5 | * Authors: Fritz Elfert (felfert@millenux.com) |
4 | * Peter Tiedemann (ptiedem@de.ibm.com) | 6 | * Peter Tiedemann (ptiedem@de.ibm.com) |
@@ -1339,12 +1341,6 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg) | |||
1339 | 1341 | ||
1340 | spin_unlock(&ch->collect_lock); | 1342 | spin_unlock(&ch->collect_lock); |
1341 | clear_normalized_cda(&ch->ccw[1]); | 1343 | clear_normalized_cda(&ch->ccw[1]); |
1342 | |||
1343 | CTCM_PR_DBGDATA("ccwcda=0x%p data=0x%p\n", | ||
1344 | (void *)(unsigned long)ch->ccw[1].cda, | ||
1345 | ch->trans_skb->data); | ||
1346 | ch->ccw[1].count = ch->max_bufsize; | ||
1347 | |||
1348 | if (set_normalized_cda(&ch->ccw[1], ch->trans_skb->data)) { | 1344 | if (set_normalized_cda(&ch->ccw[1], ch->trans_skb->data)) { |
1349 | dev_kfree_skb_any(ch->trans_skb); | 1345 | dev_kfree_skb_any(ch->trans_skb); |
1350 | ch->trans_skb = NULL; | 1346 | ch->trans_skb = NULL; |
@@ -1354,11 +1350,6 @@ static void ctcmpc_chx_txdone(fsm_instance *fi, int event, void *arg) | |||
1354 | fsm_event(priv->mpcg->fsm, MPCG_EVENT_INOP, dev); | 1350 | fsm_event(priv->mpcg->fsm, MPCG_EVENT_INOP, dev); |
1355 | return; | 1351 | return; |
1356 | } | 1352 | } |
1357 | |||
1358 | CTCM_PR_DBGDATA("ccwcda=0x%p data=0x%p\n", | ||
1359 | (void *)(unsigned long)ch->ccw[1].cda, | ||
1360 | ch->trans_skb->data); | ||
1361 | |||
1362 | ch->ccw[1].count = ch->trans_skb->len; | 1353 | ch->ccw[1].count = ch->trans_skb->len; |
1363 | fsm_addtimer(&ch->timer, CTCM_TIME_5_SEC, CTC_EVENT_TIMER, ch); | 1354 | fsm_addtimer(&ch->timer, CTCM_TIME_5_SEC, CTC_EVENT_TIMER, ch); |
1364 | ch->prof.send_stamp = current_kernel_time(); /* xtime */ | 1355 | ch->prof.send_stamp = current_kernel_time(); /* xtime */ |
@@ -1523,7 +1514,7 @@ static void ctcmpc_chx_firstio(fsm_instance *fi, int event, void *arg) | |||
1523 | goto done; | 1514 | goto done; |
1524 | default: | 1515 | default: |
1525 | break; | 1516 | break; |
1526 | } | 1517 | }; |
1527 | 1518 | ||
1528 | fsm_newstate(fi, (CHANNEL_DIRECTION(ch->flags) == CTCM_READ) | 1519 | fsm_newstate(fi, (CHANNEL_DIRECTION(ch->flags) == CTCM_READ) |
1529 | ? CTC_STATE_RXINIT : CTC_STATE_TXINIT); | 1520 | ? CTC_STATE_RXINIT : CTC_STATE_TXINIT); |