aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.2/0020-NET-MIPS-lantiq-non-existing-phy-was-not-handled-gra.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2012-04-12 12:33:56 +0000
committerJohn Crispin <john@openwrt.org>2012-04-12 12:33:56 +0000
commite3889bcf7c8ad2eff0eaeb62dbc4c0977a972788 (patch)
treec69a83b322c88d9516c9022635a80d5803ac83c3 /target/linux/lantiq/patches-3.2/0020-NET-MIPS-lantiq-non-existing-phy-was-not-handled-gra.patch
parent1b7578845130f5ea6f4096f62bfe0f49a7315d4f (diff)
downloadupstream-e3889bcf7c8ad2eff0eaeb62dbc4c0977a972788.tar.gz
upstream-e3889bcf7c8ad2eff0eaeb62dbc4c0977a972788.tar.bz2
upstream-e3889bcf7c8ad2eff0eaeb62dbc4c0977a972788.zip
update 3.2 patches
sync with lantiq kernel series SVN-Revision: 31260
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0020-NET-MIPS-lantiq-non-existing-phy-was-not-handled-gra.patch')
-rw-r--r--target/linux/lantiq/patches-3.2/0020-NET-MIPS-lantiq-non-existing-phy-was-not-handled-gra.patch62
1 files changed, 0 insertions, 62 deletions
diff --git a/target/linux/lantiq/patches-3.2/0020-NET-MIPS-lantiq-non-existing-phy-was-not-handled-gra.patch b/target/linux/lantiq/patches-3.2/0020-NET-MIPS-lantiq-non-existing-phy-was-not-handled-gra.patch
deleted file mode 100644
index 95dd0a9ad0..0000000000
--- a/target/linux/lantiq/patches-3.2/0020-NET-MIPS-lantiq-non-existing-phy-was-not-handled-gra.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From d9cddd0b4062e66f350297b4b855ef4db3a1c16b Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Tue, 15 Nov 2011 14:52:21 +0100
-Subject: [PATCH 20/70] NET: MIPS: lantiq: non existing phy was not handled
- gracefully
-
-The code blindly assumed that that a PHY device was present causing a BadVA.
-In addition the driver should not fail to load incase no PHY was found.
-Instead we print the following line and continue with no attached PHY.
-
- etop: mdio probe failed
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
-Cc: netdev@vger.kernel.org
----
- drivers/net/ethernet/lantiq_etop.c | 14 ++++++++------
- 1 files changed, 8 insertions(+), 6 deletions(-)
-
---- a/drivers/net/ethernet/lantiq_etop.c
-+++ b/drivers/net/ethernet/lantiq_etop.c
-@@ -612,7 +612,8 @@ ltq_etop_open(struct net_device *dev)
- ltq_dma_open(&ch->dma);
- napi_enable(&ch->napi);
- }
-- phy_start(priv->phydev);
-+ if (priv->phydev)
-+ phy_start(priv->phydev);
- netif_tx_start_all_queues(dev);
- return 0;
- }
-@@ -624,7 +625,8 @@ ltq_etop_stop(struct net_device *dev)
- int i;
-
- netif_tx_stop_all_queues(dev);
-- phy_stop(priv->phydev);
-+ if (priv->phydev)
-+ phy_stop(priv->phydev);
- for (i = 0; i < MAX_DMA_CHAN; i++) {
- struct ltq_etop_chan *ch = &priv->ch[i];
-
-@@ -770,9 +772,10 @@ ltq_etop_init(struct net_device *dev)
- if (err)
- goto err_netdev;
- ltq_etop_set_multicast_list(dev);
-- err = ltq_etop_mdio_init(dev);
-- if (err)
-- goto err_netdev;
-+ if (!ltq_etop_mdio_init(dev))
-+ dev->ethtool_ops = &ltq_etop_ethtool_ops;
-+ else
-+ pr_warn("etop: mdio probe failed\n");;
- return 0;
-
- err_netdev:
-@@ -868,7 +871,6 @@ ltq_etop_probe(struct platform_device *p
- dev = alloc_etherdev_mq(sizeof(struct ltq_etop_priv), 4);
- strcpy(dev->name, "eth%d");
- dev->netdev_ops = &ltq_eth_netdev_ops;
-- dev->ethtool_ops = &ltq_etop_ethtool_ops;
- priv = netdev_priv(dev);
- priv->res = res;
- priv->pldata = dev_get_platdata(&pdev->dev);