projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
[cascardo/linux.git]
/
drivers
/
net
/
r6040.c
diff --git
a/drivers/net/r6040.c
b/drivers/net/r6040.c
index
b2dcdb5
..
0a37f99
100644
(file)
--- a/
drivers/net/r6040.c
+++ b/
drivers/net/r6040.c
@@
-49,12
+49,12
@@
#include <asm/processor.h>
#define DRV_NAME "r6040"
#include <asm/processor.h>
#define DRV_NAME "r6040"
-#define DRV_VERSION "0.2
1
"
-#define DRV_RELDATE "
09Jan
2009"
+#define DRV_VERSION "0.2
2
"
+#define DRV_RELDATE "
25Mar
2009"
/* PHY CHIP Address */
#define PHY1_ADDR 1 /* For MAC1 */
/* PHY CHIP Address */
#define PHY1_ADDR 1 /* For MAC1 */
-#define PHY2_ADDR
2
/* For MAC2 */
+#define PHY2_ADDR
3
/* For MAC2 */
#define PHY_MODE 0x3100 /* PHY CHIP Register 0 */
#define PHY_CAP 0x01E1 /* PHY CHIP Register 4 */
#define PHY_MODE 0x3100 /* PHY CHIP Register 0 */
#define PHY_CAP 0x01E1 /* PHY CHIP Register 4 */
@@
-484,12
+484,12
@@
static int r6040_close(struct net_device *dev)
/* Free Descriptor memory */
if (lp->rx_ring) {
pci_free_consistent(pdev, RX_DESC_SIZE, lp->rx_ring, lp->rx_ring_dma);
/* Free Descriptor memory */
if (lp->rx_ring) {
pci_free_consistent(pdev, RX_DESC_SIZE, lp->rx_ring, lp->rx_ring_dma);
- lp->rx_ring =
0
;
+ lp->rx_ring =
NULL
;
}
if (lp->tx_ring) {
pci_free_consistent(pdev, TX_DESC_SIZE, lp->tx_ring, lp->tx_ring_dma);
}
if (lp->tx_ring) {
pci_free_consistent(pdev, TX_DESC_SIZE, lp->tx_ring, lp->tx_ring_dma);
- lp->tx_ring =
0
;
+ lp->tx_ring =
NULL
;
}
return 0;
}
return 0;
@@
-676,7
+676,7
@@
static int r6040_poll(struct napi_struct *napi, int budget)
work_done = r6040_rx(dev, budget);
if (work_done < budget) {
work_done = r6040_rx(dev, budget);
if (work_done < budget) {
- n
etif_rx
_complete(napi);
+ n
api
_complete(napi);
/* Enable RX interrupt */
iowrite16(ioread16(ioaddr + MIER) | RX_INTS, ioaddr + MIER);
}
/* Enable RX interrupt */
iowrite16(ioread16(ioaddr + MIER) | RX_INTS, ioaddr + MIER);
}
@@
-713,7
+713,7
@@
static irqreturn_t r6040_interrupt(int irq, void *dev_id)
/* Mask off RX interrupt */
misr &= ~RX_INTS;
/* Mask off RX interrupt */
misr &= ~RX_INTS;
- n
etif_rx
_schedule(&lp->napi);
+ n
api
_schedule(&lp->napi);
}
/* TX interrupt request */
}
/* TX interrupt request */