diff options
Diffstat (limited to 'drivers/net/irda/irda-usb.c')
| -rw-r--r-- | drivers/net/irda/irda-usb.c | 10 | 
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c index 48b2f9a321b7..f6c916312577 100644 --- a/drivers/net/irda/irda-usb.c +++ b/drivers/net/irda/irda-usb.c @@ -495,18 +495,12 @@ static netdev_tx_t irda_usb_hard_xmit(struct sk_buff *skb,  		mtt = irda_get_mtt(skb);  		if (mtt) {  			int diff; -			do_gettimeofday(&self->now); -			diff = self->now.tv_usec - self->stamp.tv_usec; +			diff = ktime_us_delta(ktime_get(), self->stamp);  #ifdef IU_USB_MIN_RTT  			/* Factor in USB delays -> Get rid of udelay() that  			 * would be lost in the noise - Jean II */  			diff += IU_USB_MIN_RTT;  #endif /* IU_USB_MIN_RTT */ -			/* If the usec counter did wraparound, the diff will -			 * go negative (tv_usec is a long), so we need to -			 * correct it by one second. Jean II */ -			if (diff < 0) -				diff += 1000000;  		        /* Check if the mtt is larger than the time we have  			 * already used by all the protocol processing @@ -869,7 +863,7 @@ static void irda_usb_receive(struct urb *urb)  	 * reduce the min turn time a bit since we will know  	 * how much time we have used for protocol processing  	 */ -        do_gettimeofday(&self->stamp); +	self->stamp = ktime_get();  	/* Check if we need to copy the data to a new skb or not.  	 * For most frames, we use ZeroCopy and pass the already  | 

