git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
atm
/
ambassador.c
diff --git
a/drivers/atm/ambassador.c
b/drivers/atm/ambassador.c
index
c46d952
..
4b6bf19
100644
(file)
--- 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);
// 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;
// end of our responsability
atm_vcc->push (atm_vcc, skb);
return;
@@
-794,7
+794,9
@@
static void drain_rx_pools (amb_dev * dev) {
drain_rx_pool (dev, pool);
}
drain_rx_pool (dev, pool);
}
-static inline void fill_rx_pool (amb_dev * dev, unsigned char pool, int priority) {
+static inline void fill_rx_pool (amb_dev * dev, unsigned char pool,
+ gfp_t priority)
+{
rx_in rx;
amb_rxq * rxq;
rx_in rx;
amb_rxq * rxq;