X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fatm%2Fambassador.c;h=4b6bf19c39c004d4b2277f11e68ac2ea59a4b753;hb=d6d3f5bc68be3c4ab84e6f1f9db92291da671504;hp=73c6b85299c12e1e34097b7723b039ef5fc522e3;hpb=a8b3e6f10f08f66ae1072efd087b30966a3654f6;p=linux-2.6

diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
index 73c6b85299..4b6bf19c39 100644
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
@@ -513,7 +513,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
 	  
 	  // VC layer stats
 	  atomic_inc(&atm_vcc->stats->rx);
-	  do_gettimeofday(&skb->stamp);
+	  __net_timestamp(skb);
 	  // end of our responsability
 	  atm_vcc->push (atm_vcc, skb);
 	  return;
@@ -795,7 +795,7 @@ static void drain_rx_pools (amb_dev * dev) {
 }
 
 static inline void fill_rx_pool (amb_dev * dev, unsigned char pool,
-                                 unsigned int __nocast priority)
+                                 gfp_t priority)
 {
   rx_in rx;
   amb_rxq * rxq;