diff options
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch b/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch index 510401768..f0be25315 100644 --- a/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch +++ b/target/linux/ixp4xx/patches-2.6.25/202-npe_driver_switch_support.patch @@ -1,8 +1,6 @@ -Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c -=================================================================== ---- linux-2.6.25.4.orig/drivers/net/arm/ixp4xx_eth.c -+++ linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c -@@ -165,14 +165,15 @@ struct port { +--- a/drivers/net/arm/ixp4xx_eth.c ++++ b/drivers/net/arm/ixp4xx_eth.c +@@ -165,14 +165,15 @@ struct net_device *netdev; struct napi_struct napi; struct net_device_stats stat; @@ -20,7 +18,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c }; /* NPE message structure */ -@@ -316,12 +317,13 @@ static void mdio_write(struct net_device +@@ -316,12 +317,13 @@ spin_unlock_irqrestore(&mdio_lock, flags); } @@ -36,7 +34,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c while (cycles < MAX_MII_RESET_RETRIES) { if (!(mdio_read(dev, phy_id, MII_BMCR) & BMCR_RESET)) { -@@ -335,12 +337,12 @@ static void phy_reset(struct net_device +@@ -335,12 +337,12 @@ cycles++; } @@ -52,7 +50,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c __raw_writel(DEFAULT_TX_CNTRL0 & ~TX_CNTRL0_HALFDUPLEX, &port->regs->tx_control[0]); else -@@ -348,7 +350,7 @@ static void eth_set_duplex(struct port * +@@ -348,7 +350,7 @@ &port->regs->tx_control[0]); } @@ -61,7 +59,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c static void phy_check_media(struct port *port, int init) { if (mii_check_media(&port->mii, 1, init)) -@@ -367,7 +369,63 @@ static void phy_check_media(struct port +@@ -367,7 +369,63 @@ } } } @@ -125,7 +123,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c static void mdio_thread(struct work_struct *work) { -@@ -792,9 +850,12 @@ static int eth_ioctl(struct net_device * +@@ -792,9 +850,12 @@ if (!netif_running(dev)) return -EINVAL; @@ -140,7 +138,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c return err; } -@@ -947,7 +1008,8 @@ static int eth_open(struct net_device *d +@@ -947,7 +1008,8 @@ } } @@ -150,7 +148,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c memset(&msg, 0, sizeof(msg)); msg.cmd = NPE_VLAN_SETRXQOSENTRY; -@@ -1107,10 +1169,8 @@ static int eth_close(struct net_device * +@@ -1107,10 +1169,8 @@ printk(KERN_CRIT "%s: unable to disable loopback\n", dev->name); @@ -163,7 +161,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c if (!ports_open) qmgr_disable_irq(TXDONE_QUEUE); -@@ -1120,6 +1180,42 @@ static int eth_close(struct net_device * +@@ -1120,6 +1180,42 @@ return 0; } @@ -206,7 +204,7 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c static int __devinit eth_init_one(struct platform_device *pdev) { struct port *port; -@@ -1192,20 +1288,7 @@ static int __devinit eth_init_one(struct +@@ -1192,20 +1288,7 @@ __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control); udelay(50); @@ -228,11 +226,9 @@ Index: linux-2.6.25.4/drivers/net/arm/ixp4xx_eth.c INIT_DELAYED_WORK(&port->mdio_thread, mdio_thread); return 0; -Index: linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h -=================================================================== ---- linux-2.6.25.4.orig/include/asm-arm/arch-ixp4xx/platform.h -+++ linux-2.6.25.4/include/asm-arm/arch-ixp4xx/platform.h -@@ -95,12 +95,15 @@ struct sys_timer; +--- a/include/asm-arm/arch-ixp4xx/platform.h ++++ b/include/asm-arm/arch-ixp4xx/platform.h +@@ -95,12 +95,15 @@ #define IXP4XX_ETH_NPEB 0x10 #define IXP4XX_ETH_NPEC 0x20 |