aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/fec.c36
1 files changed, 2 insertions, 34 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 8408b43d50d9..ba6db36c12a3 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -1362,18 +1362,8 @@ static void __inline__ fec_request_intrs(struct net_device *dev)
1362 unsigned short irq; 1362 unsigned short irq;
1363 } *idp, id[] = { 1363 } *idp, id[] = {
1364 { "fec(TXF)", 23 }, 1364 { "fec(TXF)", 23 },
1365 { "fec(TXB)", 24 },
1366 { "fec(TXFIFO)", 25 },
1367 { "fec(TXCR)", 26 },
1368 { "fec(RXF)", 27 }, 1365 { "fec(RXF)", 27 },
1369 { "fec(RXB)", 28 },
1370 { "fec(MII)", 29 }, 1366 { "fec(MII)", 29 },
1371 { "fec(LC)", 30 },
1372 { "fec(HBERR)", 31 },
1373 { "fec(GRA)", 32 },
1374 { "fec(EBERR)", 33 },
1375 { "fec(BABT)", 34 },
1376 { "fec(BABR)", 35 },
1377 { NULL }, 1367 { NULL },
1378 }; 1368 };
1379 1369
@@ -1533,18 +1523,8 @@ static void __inline__ fec_request_intrs(struct net_device *dev)
1533 unsigned short irq; 1523 unsigned short irq;
1534 } *idp, id[] = { 1524 } *idp, id[] = {
1535 { "fec(TXF)", 23 }, 1525 { "fec(TXF)", 23 },
1536 { "fec(TXB)", 24 },
1537 { "fec(TXFIFO)", 25 },
1538 { "fec(TXCR)", 26 },
1539 { "fec(RXF)", 27 }, 1526 { "fec(RXF)", 27 },
1540 { "fec(RXB)", 28 },
1541 { "fec(MII)", 29 }, 1527 { "fec(MII)", 29 },
1542 { "fec(LC)", 30 },
1543 { "fec(HBERR)", 31 },
1544 { "fec(GRA)", 32 },
1545 { "fec(EBERR)", 33 },
1546 { "fec(BABT)", 34 },
1547 { "fec(BABR)", 35 },
1548 { NULL }, 1528 { NULL },
1549 }; 1529 };
1550 1530
@@ -1660,18 +1640,8 @@ static void __inline__ fec_request_intrs(struct net_device *dev)
1660 unsigned short irq; 1640 unsigned short irq;
1661 } *idp, id[] = { 1641 } *idp, id[] = {
1662 { "fec(TXF)", 36 }, 1642 { "fec(TXF)", 36 },
1663 { "fec(TXB)", 37 },
1664 { "fec(TXFIFO)", 38 },
1665 { "fec(TXCR)", 39 },
1666 { "fec(RXF)", 40 }, 1643 { "fec(RXF)", 40 },
1667 { "fec(RXB)", 41 },
1668 { "fec(MII)", 42 }, 1644 { "fec(MII)", 42 },
1669 { "fec(LC)", 43 },
1670 { "fec(HBERR)", 44 },
1671 { "fec(GRA)", 45 },
1672 { "fec(EBERR)", 46 },
1673 { "fec(BABT)", 47 },
1674 { "fec(BABR)", 48 },
1675 { NULL }, 1645 { NULL },
1676 }; 1646 };
1677 1647
@@ -2459,8 +2429,7 @@ int __init fec_enet_init(struct net_device *dev)
2459 2429
2460 /* Clear and enable interrupts */ 2430 /* Clear and enable interrupts */
2461 fecp->fec_ievent = 0xffc00000; 2431 fecp->fec_ievent = 0xffc00000;
2462 fecp->fec_imask = (FEC_ENET_TXF | FEC_ENET_TXB | 2432 fecp->fec_imask = (FEC_ENET_TXF | FEC_ENET_RXF | FEC_ENET_MII);
2463 FEC_ENET_RXF | FEC_ENET_RXB | FEC_ENET_MII);
2464 2433
2465 /* Queue up command to detect the PHY and initialize the 2434 /* Queue up command to detect the PHY and initialize the
2466 * remainder of the interface. 2435 * remainder of the interface.
@@ -2587,8 +2556,7 @@ fec_restart(struct net_device *dev, int duplex)
2587 2556
2588 /* Enable interrupts we wish to service. 2557 /* Enable interrupts we wish to service.
2589 */ 2558 */
2590 fecp->fec_imask = (FEC_ENET_TXF | FEC_ENET_TXB | 2559 fecp->fec_imask = (FEC_ENET_TXF | FEC_ENET_RXF | FEC_ENET_MII);
2591 FEC_ENET_RXF | FEC_ENET_RXB | FEC_ENET_MII);
2592} 2560}
2593 2561
2594static void 2562static void