diff options
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/net/ctcmain.c | 6 | ||||
-rw-r--r-- | drivers/s390/net/netiucv.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c index b20fd0681733..92e8a37b5022 100644 --- a/drivers/s390/net/ctcmain.c +++ b/drivers/s390/net/ctcmain.c | |||
@@ -674,7 +674,7 @@ ch_action_txdone(fsm_instance * fi, int event, void *arg) | |||
674 | int first = 1; | 674 | int first = 1; |
675 | int i; | 675 | int i; |
676 | unsigned long duration; | 676 | unsigned long duration; |
677 | struct timespec done_stamp = xtime; | 677 | struct timespec done_stamp = current_kernel_time(); |
678 | 678 | ||
679 | DBF_TEXT(trace, 4, __FUNCTION__); | 679 | DBF_TEXT(trace, 4, __FUNCTION__); |
680 | 680 | ||
@@ -730,7 +730,7 @@ ch_action_txdone(fsm_instance * fi, int event, void *arg) | |||
730 | spin_unlock(&ch->collect_lock); | 730 | spin_unlock(&ch->collect_lock); |
731 | ch->ccw[1].count = ch->trans_skb->len; | 731 | ch->ccw[1].count = ch->trans_skb->len; |
732 | fsm_addtimer(&ch->timer, CTC_TIMEOUT_5SEC, CH_EVENT_TIMER, ch); | 732 | fsm_addtimer(&ch->timer, CTC_TIMEOUT_5SEC, CH_EVENT_TIMER, ch); |
733 | ch->prof.send_stamp = xtime; | 733 | ch->prof.send_stamp = current_kernel_time(); |
734 | rc = ccw_device_start(ch->cdev, &ch->ccw[0], | 734 | rc = ccw_device_start(ch->cdev, &ch->ccw[0], |
735 | (unsigned long) ch, 0xff, 0); | 735 | (unsigned long) ch, 0xff, 0); |
736 | ch->prof.doios_multi++; | 736 | ch->prof.doios_multi++; |
@@ -2281,7 +2281,7 @@ transmit_skb(struct channel *ch, struct sk_buff *skb) | |||
2281 | fsm_newstate(ch->fsm, CH_STATE_TX); | 2281 | fsm_newstate(ch->fsm, CH_STATE_TX); |
2282 | fsm_addtimer(&ch->timer, CTC_TIMEOUT_5SEC, CH_EVENT_TIMER, ch); | 2282 | fsm_addtimer(&ch->timer, CTC_TIMEOUT_5SEC, CH_EVENT_TIMER, ch); |
2283 | spin_lock_irqsave(get_ccwdev_lock(ch->cdev), saveflags); | 2283 | spin_lock_irqsave(get_ccwdev_lock(ch->cdev), saveflags); |
2284 | ch->prof.send_stamp = xtime; | 2284 | ch->prof.send_stamp = current_kernel_time(); |
2285 | rc = ccw_device_start(ch->cdev, &ch->ccw[ccw_idx], | 2285 | rc = ccw_device_start(ch->cdev, &ch->ccw[ccw_idx], |
2286 | (unsigned long) ch, 0xff, 0); | 2286 | (unsigned long) ch, 0xff, 0); |
2287 | spin_unlock_irqrestore(get_ccwdev_lock(ch->cdev), saveflags); | 2287 | spin_unlock_irqrestore(get_ccwdev_lock(ch->cdev), saveflags); |
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index 3d28e1a5bf79..268889474339 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c | |||
@@ -753,7 +753,7 @@ static void conn_action_txdone(fsm_instance *fi, int event, void *arg) | |||
753 | 753 | ||
754 | header.next = 0; | 754 | header.next = 0; |
755 | memcpy(skb_put(conn->tx_buff, NETIUCV_HDRLEN), &header, NETIUCV_HDRLEN); | 755 | memcpy(skb_put(conn->tx_buff, NETIUCV_HDRLEN), &header, NETIUCV_HDRLEN); |
756 | conn->prof.send_stamp = xtime; | 756 | conn->prof.send_stamp = current_kernel_time(); |
757 | txmsg.class = 0; | 757 | txmsg.class = 0; |
758 | txmsg.tag = 0; | 758 | txmsg.tag = 0; |
759 | rc = iucv_message_send(conn->path, &txmsg, 0, 0, | 759 | rc = iucv_message_send(conn->path, &txmsg, 0, 0, |
@@ -1185,7 +1185,7 @@ static int netiucv_transmit_skb(struct iucv_connection *conn, | |||
1185 | memcpy(skb_put(nskb, NETIUCV_HDRLEN), &header, NETIUCV_HDRLEN); | 1185 | memcpy(skb_put(nskb, NETIUCV_HDRLEN), &header, NETIUCV_HDRLEN); |
1186 | 1186 | ||
1187 | fsm_newstate(conn->fsm, CONN_STATE_TX); | 1187 | fsm_newstate(conn->fsm, CONN_STATE_TX); |
1188 | conn->prof.send_stamp = xtime; | 1188 | conn->prof.send_stamp = current_kernel_time(); |
1189 | 1189 | ||
1190 | msg.tag = 1; | 1190 | msg.tag = 1; |
1191 | msg.class = 0; | 1191 | msg.class = 0; |