hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ixp4xx: the missing phy_disconnect call has been added in upstream, remove that patch 

SVN-Revision: 18252
owl
Gabor Juhos 2009-10-31 20:10:34 +00:00
parent 5f4c7746cd
commit 9be77f8669
4 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
target/linux/ixp4xx/patches-2.6.30/204-npe_driver_add_missing_phy_disconnect.patch
View File

@ -1,10 +0,0 @@
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -1247,6 +1247,7 @@ static int __devexit eth_remove_one(stru
struct net_device *dev = platform_get_drvdata(pdev);
struct port *port = netdev_priv(dev);
+ phy_disconnect(port->phydev);
unregister_netdev(dev);
phy_disconnect(port->phydev);
npe_port_tab[NPE_ID(port->id)] = NULL;

19
target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch
View File

@ -99,12 +99,21 @@
if ((err = register_netdev(dev))) if ((err = register_netdev(dev)))
goto err_phy_dis; goto err_phy_dis;
@@ -1247,7 +1281,7 @@ static int __devexit eth_remove_one(stru @@ -1230,7 +1264,7 @@ static int __devinit eth_init_one(struct
struct net_device *dev = platform_get_drvdata(pdev); return 0;
struct port *port = netdev_priv(dev);
err_phy_dis:
- phy_disconnect(port->phydev); - phy_disconnect(port->phydev);
+ ixp4xx_phy_disconnect(dev); + ixp4xx_phy_disconnect(dev);
unregister_netdev(dev); err_free_mem:
phy_disconnect(port->phydev);
npe_port_tab[NPE_ID(port->id)] = NULL; npe_port_tab[NPE_ID(port->id)] = NULL;
platform_set_drvdata(pdev, NULL);
@@ -1248,7 +1282,7 @@ static int __devexit eth_remove_one(stru
struct port *port = netdev_priv(dev);
unregister_netdev(dev);
- phy_disconnect(port->phydev);
+ ixp4xx_phy_disconnect(dev);
npe_port_tab[NPE_ID(port->id)] = NULL;
platform_set_drvdata(pdev, NULL);
npe_release(port->npe);

10
target/linux/ixp4xx/patches-2.6.31/204-npe_driver_add_missing_phy_disconnect.patch
View File

@ -1,10 +0,0 @@
--- a/drivers/net/arm/ixp4xx_eth.c
+++ b/drivers/net/arm/ixp4xx_eth.c
@@ -1249,6 +1249,7 @@ static int __devexit eth_remove_one(stru
struct net_device *dev = platform_get_drvdata(pdev);
struct port *port = netdev_priv(dev);
+ phy_disconnect(port->phydev);
unregister_netdev(dev);
phy_disconnect(port->phydev);
npe_port_tab[NPE_ID(port->id)] = NULL;

17
target/linux/ixp4xx/patches-2.6.31/205-npe_driver_separate_phy_functions.patch
View File

@ -99,12 +99,21 @@
if ((err = register_netdev(dev))) if ((err = register_netdev(dev)))
goto err_phy_dis; goto err_phy_dis;
@@ -1249,7 +1283,7 @@ static int __devexit eth_remove_one(stru @@ -1232,7 +1266,7 @@ static int __devinit eth_init_one(struct
struct net_device *dev = platform_get_drvdata(pdev); return 0;
err_phy_dis:
- phy_disconnect(port->phydev);
+ ixp4xx_phy_disconnect(port->phydev);
err_free_mem:
npe_port_tab[NPE_ID(port->id)] = NULL;
platform_set_drvdata(pdev, NULL);
@@ -1250,7 +1284,7 @@ static int __devexit eth_remove_one(stru
struct port *port = netdev_priv(dev); struct port *port = netdev_priv(dev);
unregister_netdev(dev);
- phy_disconnect(port->phydev); - phy_disconnect(port->phydev);
+ ixp4xx_phy_disconnect(dev); + ixp4xx_phy_disconnect(dev);
unregister_netdev(dev);
phy_disconnect(port->phydev);
npe_port_tab[NPE_ID(port->id)] = NULL; npe_port_tab[NPE_ID(port->id)] = NULL;
platform_set_drvdata(pdev, NULL);
npe_release(port->npe);