2.5.37 - xtime to do_gettimeofday() in drivers/atm/*c
PATCH 1/1 2.5.37 - xtime to do_gettimeofday() in drivers/atm/*c
Greetings,
simple xtime to do_gettimeofday() as indicated in the subject.
Please apply.
drivers/atm/ambassador.c +1 -1
@@ -516,7 +516,7 @@ static void rx_complete (amb_dev * dev,// VC layer stats atomic_inc (&atm_vcc->stats->rx); - skb->stamp = xtime; +do_gettimeofday (&skb->stamp);// end of our responsability atm_vcc->push (atm_vcc, skb);return ;
drivers/atm/atmtcp.c +1 -1
@@ -275,7 +275,7 @@ static int atmtcp_c_send(struct atm_vcc result = -ENOBUFS ; goto done; } - new_skb->stamp = xtime; +do_gettimeofday (&new_skb->stamp);memcpy (skb_put (new_skb,skb->len),skb->data,skb->len); out_vcc->push (out_vcc,new_skb);atomic_inc (&vcc->stats->tx);
drivers/atm/eni.c +1 -1
@@ -702,7 +702,7 @@ static void get_service(struct atm_dev *DPRINTK ("Grr, servicing VCC %ld twice\n" ,vci);continue ; } -ENI_VCC (vcc)->timestamp = xtime; +do_gettimeofday (&ENI_VCC (vcc)->timestamp);ENI_VCC (vcc)->next =NULL ;if (vcc->qos.rxtp.traffic_class ==ATM_CBR ) {if (eni_dev->fast)
drivers/atm/fore200e.c +2 -1
@@ -1134,7 +1134,8 @@ fore200e_push_rpd(struct fore200e* fore2return ; } - skb->stamp = vcc->timestamp = xtime; +do_gettimeofday (&vcc->timestamp); + skb->stamp = vcc->timestamp;#ifdef FORE200E_52BYTE_AAL0_SDU if (cell_header) {
drivers/atm/horizon.c +1 -1
@@ -1049,7 +1049,7 @@ static void rx_schedule (hrz_dev * dev,struct atm_vcc * vcc =ATM_SKB (skb)->vcc;// VC layer stats atomic_inc (&vcc->stats->rx); - skb->stamp = xtime; +do_gettimeofday (&skb->stamp);// end of our responsability vcc->push (vcc, skb); }
drivers/atm/idt77252.c +4 -4
@@ -1099,7 +1099,7 @@ dequeue_rx(struct idt77252_dev *card, st cell, ATM_CELL_PAYLOAD);ATM_SKB (sb)->vcc = vcc; - sb->stamp = xtime; +do_gettimeofday (&sb->stamp); vcc->push (vcc, sb);atomic_inc (&vcc->stats->rx);
@@ -1177,7 +1177,7 @@ dequeue_rx(struct idt77252_dev *card, stskb_trim (skb, len);ATM_SKB (skb)->vcc = vcc; - skb->stamp = xtime; +do_gettimeofday (&skb->stamp); vcc->push (vcc, skb);atomic_inc (&vcc->stats->rx);
@@ -1199,7 +1199,7 @@ dequeue_rx(struct idt77252_dev *card, stskb_trim (skb, len);ATM_SKB (skb)->vcc = vcc; - skb->stamp = xtime; +do_gettimeofday (&skb->stamp); vcc->push (vcc, skb);atomic_inc (&vcc->stats->rx);
@@ -1337,7 +1337,7 @@ idt77252_rx_raw(struct idt77252_dev *car ATM_CELL_PAYLOAD);ATM_SKB (sb)->vcc = vcc; - sb->stamp = xtime; +do_gettimeofday (&sb->stamp); vcc->push (vcc, sb);atomic_inc (&vcc->stats->rx);
drivers/atm/lanai.c +1 -1
@@ -1606,7 +1606,7 @@ static void vcc_rx_aal5(struct lanai_vcc }skb_put (skb, size);ATM_SKB (skb)->vcc = lvcc->rx.atmvcc; - skb->stamp = xtime; +do_gettimeofday (&skb->stamp);vcc_rx_memcpy (skb->data, lvcc, size); lvcc->rx.atmvcc->push (lvcc->rx.atmvcc, skb);atomic_inc (&lvcc->rx.atmvcc->stats->rx);
drivers/atm/nicstar.c +5 -5
@@ -2264,7 +2264,7 @@ static void dequeue_rx(ns_dev *card, ns_memcpy (sb->tail, cell,ATM_CELL_PAYLOAD );skb_put (sb,ATM_CELL_PAYLOAD );ATM_SKB (sb)->vcc = vcc; - sb->stamp = xtime; +do_gettimeofday (&sb->stamp); vcc->push (vcc, sb);atomic_inc (&vcc->stats->rx); cell +=ATM_CELL_PAYLOAD ;
@@ -2395,7 +2395,7 @@ static void dequeue_rx(ns_dev *card, ns_ skb->destructor = ns_sb_destructor;#endif /* NS_USE_DESTRUCTORS */ ATM_SKB (skb)->vcc = vcc; - skb->stamp = xtime; +do_gettimeofday (&skb->stamp); vcc->push (vcc, skb);atomic_inc (&vcc->stats->rx); }
@@ -2422,7 +2422,7 @@ static void dequeue_rx(ns_dev *card, ns_ sb->destructor = ns_sb_destructor;#endif /* NS_USE_DESTRUCTORS */ ATM_SKB (sb)->vcc = vcc; - sb->stamp = xtime; +do_gettimeofday (&sb->stamp); vcc->push (vcc, sb);atomic_inc (&vcc->stats->rx); }
@@ -2448,7 +2448,7 @@ static void dequeue_rx(ns_dev *card, ns_memcpy (skb->data, sb->data,NS_SMBUFSIZE );skb_put (skb, len -NS_SMBUFSIZE );ATM_SKB (skb)->vcc = vcc; - skb->stamp = xtime; +do_gettimeofday (&skb->stamp); vcc->push (vcc, skb);atomic_inc (&vcc->stats->rx); }
@@ -2554,7 +2554,7 @@ static void dequeue_rx(ns_dev *card, ns_#ifdef NS_USE_DESTRUCTORS hb->destructor = ns_hb_destructor;#endif /* NS_USE_DESTRUCTORS */ - hb->stamp = xtime; +do_gettimeofday (&hb->stamp); vcc->push (vcc, hb);atomic_inc (&vcc->stats->rx); }
drivers/atm/zatm.c +1 -1
@@ -584,7 +584,7 @@ EVENT("error code 0x%x/0x%x\n",(here[3]#ifdef CONFIG_ATM_ZATM_EXACT_TS skb->stamp =exact_time (zatm_dev,here[1 ]);#else - skb->stamp = xtime; +do_gettimeofday (&skb->stamp);#endif #if 0 printk("[-3..0] 0x%08lx 0x%08lx 0x%08lx 0x%08lx\n",((unsigned *) skb->data)[-3],
Quoted 3 lines · Francois Romieu
Greetings,
simple xtime to
do_gettimeofday()as indicated in the subject.
chuckle... was just about to apply these, from another source.
Ideally we want to avoid do_gettimeofday, but it's not a huge deal so these are fine...