diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2009-10-31 20:10:34 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2009-10-31 20:10:34 +0000 |
| commit | 74d2398db58313bfa2e99658f2988847d87c56d2 (patch) | |
| tree | 4ca42fed519432996acb31d5e01823091d6078c6 /target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch | |
| parent | f5bf707c8cfba441de71b465ad4cd95961a58300 (diff) | |
| download | master-187ad058-74d2398db58313bfa2e99658f2988847d87c56d2.tar.gz master-187ad058-74d2398db58313bfa2e99658f2988847d87c56d2.tar.bz2 master-187ad058-74d2398db58313bfa2e99658f2988847d87c56d2.zip | |
ixp4xx: the missing phy_disconnect call has been added in upstream, remove that patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18252 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch b/target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch index d962658122..53fa05e1b9 100644 --- a/target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch +++ b/target/linux/ixp4xx/patches-2.6.30/205-npe_driver_separate_phy_functions.patch @@ -99,12 +99,21 @@ if ((err = register_netdev(dev))) goto err_phy_dis; -@@ -1247,7 +1281,7 @@ static int __devexit eth_remove_one(stru - struct net_device *dev = platform_get_drvdata(pdev); - struct port *port = netdev_priv(dev); +@@ -1230,7 +1264,7 @@ static int __devinit eth_init_one(struct + return 0; + err_phy_dis: - phy_disconnect(port->phydev); + ixp4xx_phy_disconnect(dev); + err_free_mem: + 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); +- 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); |