Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8570419f authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller
Browse files

[ATM] ENI: Convert to struct timeval to ktime_t. 



Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fc910a27

drivers/atm/eni.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -536,7 +536,7 @@ static int rx_aal0(struct atm_vcc *vcc) 
		return 0;

		return 0;

	}

	}

	skb_put(skb,length);

	skb_put(skb,length);

	skb_set_timestamp(skb, &eni_vcc->timestamp);

	skb->tstamp = eni_vcc->timestamp;

	DPRINTK("got len %ld\n",length);

	DPRINTK("got len %ld\n",length);

	if (do_rx_dma(vcc,skb,1,length >> 2,length >> 2)) return 1;

	if (do_rx_dma(vcc,skb,1,length >> 2,length >> 2)) return 1;

	eni_vcc->rxing++;

	eni_vcc->rxing++;
@@ -701,7 +701,7 @@ static void get_service(struct atm_dev *dev) 
			DPRINTK("Grr, servicing VCC %ld twice\n",vci);

			DPRINTK("Grr, servicing VCC %ld twice\n",vci);

			continue;

			continue;

		}

		}

		do_gettimeofday(&ENI_VCC(vcc)->timestamp);

		ENI_VCC(vcc)->timestamp = ktime_get_real();

		ENI_VCC(vcc)->next = NULL;

		ENI_VCC(vcc)->next = NULL;

		if (vcc->qos.rxtp.traffic_class == ATM_CBR) {

		if (vcc->qos.rxtp.traffic_class == ATM_CBR) {

			if (eni_dev->fast)

			if (eni_dev->fast)

drivers/atm/eni.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ struct eni_vcc { 
	int rxing;			/* number of pending PDUs */

	int rxing;			/* number of pending PDUs */

	int servicing;			/* number of waiting VCs (0 or 1) */

	int servicing;			/* number of waiting VCs (0 or 1) */

	int txing;			/* number of pending TX bytes */

	int txing;			/* number of pending TX bytes */

	struct timeval timestamp;	/* for RX timing */

	ktime_t timestamp;		/* for RX timing */

	struct atm_vcc *next;		/* next pending RX */

	struct atm_vcc *next;		/* next pending RX */

	struct sk_buff *last;		/* last PDU being DMAed (used to carry

	struct sk_buff *last;		/* last PDU being DMAed (used to carry

					   discard information) */

					   discard information) */