Commit 4e0c04ff authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] kill stupid search and destroy error

parent 0c26cf9e
...@@ -260,7 +260,7 @@ static void InitDscrs(struct net_device *dev) ...@@ -260,7 +260,7 @@ static void InitDscrs(struct net_device *dev)
else else
tda.link = addr + sizeof(tda_t); tda.link = addr + sizeof(tda_t);
tda.link |= 1; tda.link |= 1;
isa_memcpy_to_io(dev->mem_start + addr, &tda, sizeof(tda_t)); isa_memcpy_toio(dev->mem_start + addr, &tda, sizeof(tda_t));
addr += sizeof(tda_t); addr += sizeof(tda_t);
baddr += PKTSIZE; baddr += PKTSIZE;
} }
...@@ -280,7 +280,7 @@ static void InitDscrs(struct net_device *dev) ...@@ -280,7 +280,7 @@ static void InitDscrs(struct net_device *dev)
rra.starthi = 0; rra.starthi = 0;
rra.cntlo = PKTSIZE >> 1; rra.cntlo = PKTSIZE >> 1;
rra.cnthi = 0; rra.cnthi = 0;
isa_memcpy_to_io(dev->mem_start + raddr, &rra, sizeof(rra_t)); isa_memcpy_toio(dev->mem_start + raddr, &rra, sizeof(rra_t));
rda.status = 0; rda.status = 0;
rda.length = 0; rda.length = 0;
...@@ -292,7 +292,7 @@ static void InitDscrs(struct net_device *dev) ...@@ -292,7 +292,7 @@ static void InitDscrs(struct net_device *dev)
else else
rda.link = 1; rda.link = 1;
rda.inuse = 1; rda.inuse = 1;
isa_memcpy_to_io(dev->mem_start + addr, &rda, sizeof(rda_t)); isa_memcpy_toio(dev->mem_start + addr, &rda, sizeof(rda_t));
baddr += PKTSIZE; baddr += PKTSIZE;
raddr += sizeof(rra_t); raddr += sizeof(rra_t);
...@@ -429,8 +429,8 @@ static void InitBoard(struct net_device *dev) ...@@ -429,8 +429,8 @@ static void InitBoard(struct net_device *dev)
/* feed CDA into SONIC, initialize RCR value (always get broadcasts) */ /* feed CDA into SONIC, initialize RCR value (always get broadcasts) */
isa_memcpy_to_io(dev->mem_start, cams, sizeof(camentry_t) * camcnt); isa_memcpy_toio(dev->mem_start, cams, sizeof(camentry_t) * camcnt);
isa_memcpy_to_io(dev->mem_start + (sizeof(camentry_t) * camcnt), &cammask, sizeof(cammask)); isa_memcpy_toio(dev->mem_start + (sizeof(camentry_t) * camcnt), &cammask, sizeof(cammask));
#ifdef DEBUG #ifdef DEBUG
printk("CAM setup:\n"); printk("CAM setup:\n");
...@@ -627,14 +627,14 @@ static void irqrx_handler(struct net_device *dev) ...@@ -627,14 +627,14 @@ static void irqrx_handler(struct net_device *dev)
rda.link = 1; rda.link = 1;
rda.inuse = 1; rda.inuse = 1;
isa_memcpy_to_io(dev->mem_start + rdaaddr, &rda, isa_memcpy_toio(dev->mem_start + rdaaddr, &rda,
sizeof(rda_t)); sizeof(rda_t));
/* set up link and EOL = 0 in currently last descriptor. Only write /* set up link and EOL = 0 in currently last descriptor. Only write
the link field since the SONIC may currently already access the the link field since the SONIC may currently already access the
other fields. */ other fields. */
isa_memcpy_to_io(dev->mem_start + lrdaaddr + 20, &rdaaddr, 4); isa_memcpy_toio(dev->mem_start + lrdaaddr + 20, &rdaaddr, 4);
/* advance indices */ /* advance indices */
...@@ -833,7 +833,7 @@ static int ibmlana_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -833,7 +833,7 @@ static int ibmlana_tx(struct sk_buff *skb, struct net_device *dev)
if (tmplen < 60) if (tmplen < 60)
tmplen = 60; tmplen = 60;
baddr = priv->txbufstart + (priv->nexttxdescr * PKTSIZE); baddr = priv->txbufstart + (priv->nexttxdescr * PKTSIZE);
isa_memcpy_to_io(dev->mem_start + baddr, skb->data, skb->len); isa_memcpy_toio(dev->mem_start + baddr, skb->data, skb->len);
/* copy filler into RAM - in case we're filling up... /* copy filler into RAM - in case we're filling up...
we're filling a bit more than necessary, but that doesn't harm we're filling a bit more than necessary, but that doesn't harm
...@@ -845,7 +845,7 @@ static int ibmlana_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -845,7 +845,7 @@ static int ibmlana_tx(struct sk_buff *skb, struct net_device *dev)
unsigned int destoffs = skb->len, l = strlen(fill); unsigned int destoffs = skb->len, l = strlen(fill);
while (destoffs < tmplen) { while (destoffs < tmplen) {
isa_memcpy_to_io(dev->mem_start + baddr + destoffs, fill, l); isa_memcpy_toio(dev->mem_start + baddr + destoffs, fill, l);
destoffs += l; destoffs += l;
} }
} }
...@@ -854,7 +854,7 @@ static int ibmlana_tx(struct sk_buff *skb, struct net_device *dev) ...@@ -854,7 +854,7 @@ static int ibmlana_tx(struct sk_buff *skb, struct net_device *dev)
addr = priv->tdastart + (priv->nexttxdescr * sizeof(tda_t)); addr = priv->tdastart + (priv->nexttxdescr * sizeof(tda_t));
isa_memcpy_fromio(&tda, dev->mem_start + addr, sizeof(tda_t)); isa_memcpy_fromio(&tda, dev->mem_start + addr, sizeof(tda_t));
tda.length = tda.fraglength = tmplen; tda.length = tda.fraglength = tmplen;
isa_memcpy_to_io(dev->mem_start + addr, &tda, sizeof(tda_t)); isa_memcpy_toio(dev->mem_start + addr, &tda, sizeof(tda_t));
/* if there were no active descriptors, trigger the SONIC */ /* if there were no active descriptors, trigger the SONIC */
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment