diff options
author | Luka Perkov <luka@openwrt.org> | 2013-10-03 02:50:00 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2013-10-03 02:50:00 +0000 |
commit | 38936426f7d4d569f918cb2ca646263b4c38e25b (patch) | |
tree | 66668ff6f447e0a95ee40e3cb8cbe3e211af3874 /target/linux/kirkwood/patches-3.10/0020-net-mv643xx_eth-use-phy_disconnect-instead-of-phy_de.patch | |
parent | 97b15fc45be3d44b1d7700e92433703a139fb97c (diff) | |
download | upstream-38936426f7d4d569f918cb2ca646263b4c38e25b.tar.gz upstream-38936426f7d4d569f918cb2ca646263b4c38e25b.tar.bz2 upstream-38936426f7d4d569f918cb2ca646263b4c38e25b.zip |
kirkwood: update patches and configuration (3.10)
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 38295
Diffstat (limited to 'target/linux/kirkwood/patches-3.10/0020-net-mv643xx_eth-use-phy_disconnect-instead-of-phy_de.patch')
-rw-r--r-- | target/linux/kirkwood/patches-3.10/0020-net-mv643xx_eth-use-phy_disconnect-instead-of-phy_de.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/kirkwood/patches-3.10/0020-net-mv643xx_eth-use-phy_disconnect-instead-of-phy_de.patch b/target/linux/kirkwood/patches-3.10/0020-net-mv643xx_eth-use-phy_disconnect-instead-of-phy_de.patch new file mode 100644 index 0000000000..0974985105 --- /dev/null +++ b/target/linux/kirkwood/patches-3.10/0020-net-mv643xx_eth-use-phy_disconnect-instead-of-phy_de.patch @@ -0,0 +1,29 @@ +From 799e69d38053e344267360a583676eafe2ed8648 Mon Sep 17 00:00:00 2001 +From: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> +Date: Wed, 29 May 2013 09:32:43 +0000 +Subject: [PATCH 20/29] net: mv643xx_eth: use phy_disconnect instead of + phy_detach + +Using a separated mdio bus driver with mvmdio, phy_detach on network device +removal will not stop the phy and finally lead to NULL pointer dereference +in mvmdio due to non-existent network device. Use phy_disconnect instead +to properly stop phy device from accessing network device prior removal of +the network device. + +Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> +Signed-off-by: David S. Miller <davem@davemloft.net> +--- + drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/net/ethernet/marvell/mv643xx_eth.c ++++ b/drivers/net/ethernet/marvell/mv643xx_eth.c +@@ -2805,7 +2805,7 @@ static int mv643xx_eth_remove(struct pla + + unregister_netdev(mp->dev); + if (mp->phy != NULL) +- phy_detach(mp->phy); ++ phy_disconnect(mp->phy); + cancel_work_sync(&mp->tx_timeout_task); + + if (!IS_ERR(mp->clk)) |