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
/
horizon.c
diff --git
a/drivers/atm/horizon.c
b/drivers/atm/horizon.c
index
924a2c8
..
821c81e
100644
(file)
--- a/
drivers/atm/horizon.c
+++ b/
drivers/atm/horizon.c
@@
-1034,7
+1034,7
@@
static void rx_schedule (hrz_dev * dev, int irq) {
struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
// VC layer stats
atomic_inc(&vcc->stats->rx);
struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
// VC layer stats
atomic_inc(&vcc->stats->rx);
-
do_gettimeofday(&skb->stamp
);
+
__net_timestamp(skb
);
// end of our responsability
vcc->push (vcc, skb);
}
// end of our responsability
vcc->push (vcc, skb);
}
@@
-1511,8
+1511,8
@@
static inline short setup_idle_tx_channel (hrz_dev * dev, hrz_vcc * vcc) {
// a.k.a. prepare the channel and remember that we have done so.
tx_ch_desc * tx_desc = &memmap->tx_descs[tx_channel];
// a.k.a. prepare the channel and remember that we have done so.
tx_ch_desc * tx_desc = &memmap->tx_descs[tx_channel];
- u
16
rd_ptr;
- u
16
wr_ptr;
+ u
32
rd_ptr;
+ u
32
wr_ptr;
u16 channel = vcc->channel;
unsigned long flags;
u16 channel = vcc->channel;
unsigned long flags;