X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fatheros%2Fpatches-2.6.32%2F220-enet_micrel_workaround.patch;fp=target%2Flinux%2Fatheros%2Fpatches-2.6.32%2F220-enet_micrel_workaround.patch;h=f179c218926f745c3cc8acdb28b6b78e8c1e4fa0;hb=b1d4c14fc25492c4f08e041bc40507691c5795c5;hp=0000000000000000000000000000000000000000;hpb=0f2836ea5320a63bfde814337dbcfcde2a0821d6;p=openwrt-10.03%2F.git

diff --git a/target/linux/atheros/patches-2.6.32/220-enet_micrel_workaround.patch b/target/linux/atheros/patches-2.6.32/220-enet_micrel_workaround.patch
new file mode 100644
index 000000000..f179c2189
--- /dev/null
+++ b/target/linux/atheros/patches-2.6.32/220-enet_micrel_workaround.patch
@@ -0,0 +1,71 @@
+Index: linux-2.6.32.7/drivers/net/ar231x.c
+===================================================================
+--- linux-2.6.32.7.orig/drivers/net/ar231x.c	2010-02-03 17:02:28.998430523 +0100
++++ linux-2.6.32.7/drivers/net/ar231x.c	2010-02-03 17:03:01.346429245 +0100
+@@ -148,6 +148,7 @@
+ 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 @@
+ 
+ 	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 @@
+ 	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 @@
+ 				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 @@
+ 	struct ar231x_private *sp = netdev_priv(dev);
+ 	int ret;
+ 
++	if (!sp->phy_dev)
++		return -ENODEV;
++
+ 	switch (cmd) {
+ 
+ 	case SIOCETHTOOL: