diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-02-26 00:30:32 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-02-26 00:30:32 +0000 |
commit | 3f03eafd19221753d93b7fdb9e8cfb411d443674 (patch) | |
tree | 3731a4801f0d2d8aa973966251a20bcdc783316a /target/linux/atheros/patches-2.6.34/220-enet_micrel_workaround.patch | |
parent | c4a5ad47f235f554da741f2dff4597a6ead451b6 (diff) | |
download | master-31e0f0ae-3f03eafd19221753d93b7fdb9e8cfb411d443674.tar.gz master-31e0f0ae-3f03eafd19221753d93b7fdb9e8cfb411d443674.tar.bz2 master-31e0f0ae-3f03eafd19221753d93b7fdb9e8cfb411d443674.zip |
atheros: remove support for older kernels
SVN-Revision: 25721
Diffstat (limited to 'target/linux/atheros/patches-2.6.34/220-enet_micrel_workaround.patch')
-rw-r--r-- | target/linux/atheros/patches-2.6.34/220-enet_micrel_workaround.patch | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/target/linux/atheros/patches-2.6.34/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-2.6.34/220-enet_micrel_workaround.patch deleted file mode 100644 index 989bd76068..0000000000 --- a/target/linux/atheros/patches-2.6.34/220-enet_micrel_workaround.patch +++ /dev/null @@ -1,69 +0,0 @@ ---- a/drivers/net/ar231x.c -+++ b/drivers/net/ar231x.c -@@ -148,6 +148,7 @@ static int ar231x_mdiobus_write(struct m - static int ar231x_mdiobus_reset(struct mii_bus *bus); - static int ar231x_mdiobus_probe (struct net_device *dev); - static void ar231x_adjust_link(struct net_device *dev); -+static bool no_phy = false; - - #ifndef ERR - #define ERR(fmt, args...) printk("%s: " fmt, __func__, ##args) -@@ -278,6 +279,21 @@ int __init ar231x_probe(struct platform_ - - mdiobus_register(sp->mii_bus); - -+ /* Workaround for Micrel switch, which is only available on -+ * one PHY and cannot be configured through MDIO */ -+ if (!no_phy) { -+ u32 phy_id = 0; -+ get_phy_id(sp->mii_bus, 1, &phy_id); -+ if (phy_id == 0x00221450) -+ no_phy = true; -+ } -+ if (no_phy) { -+ sp->link = 1; -+ netif_carrier_on(dev); -+ return 0; -+ } -+ no_phy = true; -+ - if (ar231x_mdiobus_probe(dev) != 0) { - printk(KERN_ERR "%s: mdiobus_probe failed\n", dev->name); - rx_tasklet_cleanup(dev); -@@ -334,8 +350,10 @@ static int __devexit ar231x_remove(struc - rx_tasklet_cleanup(dev); - ar231x_init_cleanup(dev); - unregister_netdev(dev); -- mdiobus_unregister(sp->mii_bus); -- mdiobus_free(sp->mii_bus); -+ if (sp->mii_bus) { -+ mdiobus_unregister(sp->mii_bus); -+ mdiobus_free(sp->mii_bus); -+ } - kfree(dev); - return 0; - } -@@ -836,7 +854,12 @@ static int ar231x_rx_int(struct net_devi - dev->stats.rx_bytes += skb->len; - - /* pass the packet to upper layers */ -- sp->rx(skb); -+ if (sp->rx) { -+ sp->rx(skb); -+ } else { -+ skb->protocol = eth_type_trans(skb, skb->dev); -+ netif_rx(skb); -+ } - skb_new->dev = dev; - - /* 16 bit align */ -@@ -1123,6 +1146,9 @@ static int ar231x_ioctl(struct net_devic - struct ar231x_private *sp = netdev_priv(dev); - int ret; - -+ if (!sp->phy_dev) -+ return -ENODEV; -+ - switch (cmd) { - - case SIOCETHTOOL: |