git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge mulgrave-w:git/scsi-misc-2.6
[pandora-kernel.git]
/
drivers
/
net
/
mv643xx_eth.c
diff --git
a/drivers/net/mv643xx_eth.c
b/drivers/net/mv643xx_eth.c
index
625ff61
..
59de3e7
100644
(file)
--- a/
drivers/net/mv643xx_eth.c
+++ b/
drivers/net/mv643xx_eth.c
@@
-385,6
+385,8
@@
static int mv643xx_eth_receive_queue(struct net_device *dev, int budget)
struct pkt_info pkt_info;
while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) {
struct pkt_info pkt_info;
while (budget-- > 0 && eth_port_receive(mp, &pkt_info) == ETH_OK) {
+ dma_unmap_single(NULL, pkt_info.buf_ptr, ETH_RX_SKB_SIZE,
+ DMA_FROM_DEVICE);
mp->rx_desc_count--;
received_packets++;
mp->rx_desc_count--;
received_packets++;
@@
-778,7
+780,7
@@
static int mv643xx_eth_open(struct net_device *dev)
int err;
err = request_irq(dev->irq, mv643xx_eth_int_handler,
int err;
err = request_irq(dev->irq, mv643xx_eth_int_handler,
-
SA_SHIRQ | SA
_SAMPLE_RANDOM, dev->name, dev);
+
IRQF_SHARED | IRQF
_SAMPLE_RANDOM, dev->name, dev);
if (err) {
printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
port_num);
if (err) {
printk(KERN_ERR "Can not assign IRQ number to MV643XX_eth%d\n",
port_num);