diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-03-06 23:19:26 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:23:46 -0400 |
commit | 8570419fb7be0af84085ac8f13307392a748482c (patch) | |
tree | 1df16a424f6c9e12a768a17aa67367aa66ca7b33 | |
parent | fc910a27839584209726537698b596576940add4 (diff) |
[ATM] ENI: Convert to struct timeval to ktime_t.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/atm/eni.c | 4 | ||||
-rw-r--r-- | drivers/atm/eni.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c index 8fccf018f165..0d3a38b1cb0b 100644 --- a/drivers/atm/eni.c +++ b/drivers/atm/eni.c | |||
@@ -536,7 +536,7 @@ static int rx_aal0(struct atm_vcc *vcc) | |||
536 | return 0; | 536 | return 0; |
537 | } | 537 | } |
538 | skb_put(skb,length); | 538 | skb_put(skb,length); |
539 | skb_set_timestamp(skb, &eni_vcc->timestamp); | 539 | skb->tstamp = eni_vcc->timestamp; |
540 | DPRINTK("got len %ld\n",length); | 540 | DPRINTK("got len %ld\n",length); |
541 | if (do_rx_dma(vcc,skb,1,length >> 2,length >> 2)) return 1; | 541 | if (do_rx_dma(vcc,skb,1,length >> 2,length >> 2)) return 1; |
542 | eni_vcc->rxing++; | 542 | eni_vcc->rxing++; |
@@ -701,7 +701,7 @@ static void get_service(struct atm_dev *dev) | |||
701 | DPRINTK("Grr, servicing VCC %ld twice\n",vci); | 701 | DPRINTK("Grr, servicing VCC %ld twice\n",vci); |
702 | continue; | 702 | continue; |
703 | } | 703 | } |
704 | do_gettimeofday(&ENI_VCC(vcc)->timestamp); | 704 | ENI_VCC(vcc)->timestamp = ktime_get_real(); |
705 | ENI_VCC(vcc)->next = NULL; | 705 | ENI_VCC(vcc)->next = NULL; |
706 | if (vcc->qos.rxtp.traffic_class == ATM_CBR) { | 706 | if (vcc->qos.rxtp.traffic_class == ATM_CBR) { |
707 | if (eni_dev->fast) | 707 | if (eni_dev->fast) |
diff --git a/drivers/atm/eni.h b/drivers/atm/eni.h index 385090c2a580..d04fefb0841f 100644 --- a/drivers/atm/eni.h +++ b/drivers/atm/eni.h | |||
@@ -59,7 +59,7 @@ struct eni_vcc { | |||
59 | int rxing; /* number of pending PDUs */ | 59 | int rxing; /* number of pending PDUs */ |
60 | int servicing; /* number of waiting VCs (0 or 1) */ | 60 | int servicing; /* number of waiting VCs (0 or 1) */ |
61 | int txing; /* number of pending TX bytes */ | 61 | int txing; /* number of pending TX bytes */ |
62 | struct timeval timestamp; /* for RX timing */ | 62 | ktime_t timestamp; /* for RX timing */ |
63 | struct atm_vcc *next; /* next pending RX */ | 63 | struct atm_vcc *next; /* next pending RX */ |
64 | struct sk_buff *last; /* last PDU being DMAed (used to carry | 64 | struct sk_buff *last; /* last PDU being DMAed (used to carry |
65 | discard information) */ | 65 | discard information) */ |