Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6-omap-h63xx.git] / drivers / atm / eni.c

diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
index 8fccf018f165502f6d70b35bb9bad0f784344c20..0d3a38b1cb0b221db91c2e3d27aad589b8d1dac4 100644 (file)
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
@@ -536,7 +536,7 @@ static int rx_aal0(struct atm_vcc *vcc)
                return 0;
        }
        skb_put(skb,length);
-       skb_set_timestamp(skb, &eni_vcc->timestamp);
+       skb->tstamp = eni_vcc->timestamp;
        DPRINTK("got len %ld\n",length);
        if (do_rx_dma(vcc,skb,1,length >> 2,length >> 2)) return 1;
        eni_vcc->rxing++;
@@ -701,7 +701,7 @@ static void get_service(struct atm_dev *dev)
                        DPRINTK("Grr, servicing VCC %ld twice\n",vci);
                        continue;
                }
-               do_gettimeofday(&ENI_VCC(vcc)->timestamp);
+               ENI_VCC(vcc)->timestamp = ktime_get_real();
                ENI_VCC(vcc)->next = NULL;
                if (vcc->qos.rxtp.traffic_class == ATM_CBR) {
                        if (eni_dev->fast)