projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ARM] Off-by-one in arch/arm/common/icst*
[powerpc.git]
/
drivers
/
atm
/
idt77252.c
diff --git
a/drivers/atm/idt77252.c
b/drivers/atm/idt77252.c
index
30b7e99
..
b0369bb
100644
(file)
--- a/
drivers/atm/idt77252.c
+++ b/
drivers/atm/idt77252.c
@@
-34,8
+34,8
@@
static char const rcsid[] =
#include <linux/module.h>
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/pci.h>
#include <linux/pci.h>
+#include <linux/poison.h>
#include <linux/skbuff.h>
#include <linux/kernel.h>
#include <linux/vmalloc.h>
#include <linux/skbuff.h>
#include <linux/kernel.h>
#include <linux/vmalloc.h>
@@
-1101,7
+1101,7
@@
dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
cell, ATM_CELL_PAYLOAD);
ATM_SKB(sb)->vcc = vcc;
cell, ATM_CELL_PAYLOAD);
ATM_SKB(sb)->vcc = vcc;
-
do_gettimeofday(&sb->stamp
);
+
__net_timestamp(sb
);
vcc->push(vcc, sb);
atomic_inc(&vcc->stats->rx);
vcc->push(vcc, sb);
atomic_inc(&vcc->stats->rx);
@@
-1179,7
+1179,7
@@
dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
skb_trim(skb, len);
ATM_SKB(skb)->vcc = vcc;
skb_trim(skb, len);
ATM_SKB(skb)->vcc = vcc;
-
do_gettimeofday(&skb->stamp
);
+
__net_timestamp(skb
);
vcc->push(vcc, skb);
atomic_inc(&vcc->stats->rx);
vcc->push(vcc, skb);
atomic_inc(&vcc->stats->rx);
@@
-1201,7
+1201,7
@@
dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
skb_trim(skb, len);
ATM_SKB(skb)->vcc = vcc;
skb_trim(skb, len);
ATM_SKB(skb)->vcc = vcc;
-
do_gettimeofday(&skb->stamp
);
+
__net_timestamp(skb
);
vcc->push(vcc, skb);
atomic_inc(&vcc->stats->rx);
vcc->push(vcc, skb);
atomic_inc(&vcc->stats->rx);
@@
-1340,7
+1340,7
@@
idt77252_rx_raw(struct idt77252_dev *card)
ATM_CELL_PAYLOAD);
ATM_SKB(sb)->vcc = vcc;
ATM_CELL_PAYLOAD);
ATM_SKB(sb)->vcc = vcc;
-
do_gettimeofday(&sb->stamp
);
+
__net_timestamp(sb
);
vcc->push(vcc, sb);
atomic_inc(&vcc->stats->rx);
vcc->push(vcc, sb);
atomic_inc(&vcc->stats->rx);
@@
-3387,7
+3387,7
@@
init_card(struct atm_dev *dev)
writel(SAR_STAT_TMROF, SAR_REG_STAT);
}
IPRINTK("%s: Request IRQ ... ", card->name);
writel(SAR_STAT_TMROF, SAR_REG_STAT);
}
IPRINTK("%s: Request IRQ ... ", card->name);
- if (request_irq(pcidev->irq, idt77252_interrupt,
SA_INTERRUPT|SA_SHIRQ
,
+ if (request_irq(pcidev->irq, idt77252_interrupt,
IRQF_DISABLED|IRQF_SHARED
,
card->name, card) != 0) {
printk("%s: can't allocate IRQ.\n", card->name);
deinit_card(card);
card->name, card) != 0) {
printk("%s: can't allocate IRQ.\n", card->name);
deinit_card(card);
@@
-3658,7
+3658,7
@@
probe_sram(struct idt77252_dev *card)
writel(SAR_CMD_WRITE_SRAM | (0 << 2), SAR_REG_CMD);
for (addr = 0x4000; addr < 0x80000; addr += 0x4000) {
writel(SAR_CMD_WRITE_SRAM | (0 << 2), SAR_REG_CMD);
for (addr = 0x4000; addr < 0x80000; addr += 0x4000) {
- writel(
0xdeadbeef
, SAR_REG_DR0);
+ writel(
ATM_POISON
, SAR_REG_DR0);
writel(SAR_CMD_WRITE_SRAM | (addr << 2), SAR_REG_CMD);
writel(SAR_CMD_READ_SRAM | (0 << 2), SAR_REG_CMD);
writel(SAR_CMD_WRITE_SRAM | (addr << 2), SAR_REG_CMD);
writel(SAR_CMD_READ_SRAM | (0 << 2), SAR_REG_CMD);