X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Frb532%2Fpatches-2.6.30%2F100-check_media.patch;fp=target%2Flinux%2Frb532%2Fpatches-2.6.30%2F100-check_media.patch;h=0000000000000000000000000000000000000000;hb=2d20db22f18b08daf1984eff882c1d23f3285bf0;hp=66e731dac112d4e945511476c2187a8c9d95e613;hpb=3e9fcfad69e5dde22357a178db05b6af84d6aaa4;p=openwrt-10.03%2F.git

diff --git a/target/linux/rb532/patches-2.6.30/100-check_media.patch b/target/linux/rb532/patches-2.6.30/100-check_media.patch
deleted file mode 100644
index 66e731dac..000000000
--- a/target/linux/rb532/patches-2.6.30/100-check_media.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/drivers/net/korina.c
-+++ b/drivers/net/korina.c
-@@ -133,6 +133,7 @@ struct korina_private {
- 	int dma_halt_cnt;
- 	int dma_run_cnt;
- 	struct napi_struct napi;
-+	struct timer_list media_check_timer;
- 	struct mii_if_info mii_if;
- 	struct net_device *dev;
- 	int phy_addr;
-@@ -664,6 +665,15 @@ static void korina_check_media(struct ne
- 						&lp->eth_regs->ethmac2);
- }
- 
-+static void korina_poll_media(unsigned long data)
-+{
-+	struct net_device *dev = (struct net_device *) data;
-+	struct korina_private *lp = netdev_priv(dev);
-+
-+	korina_check_media(dev, 0);
-+	mod_timer(&lp->media_check_timer, jiffies + HZ);
-+}
-+
- static void korina_set_carrier(struct mii_if_info *mii)
- {
- 	if (mii->force_media) {
-@@ -1034,6 +1044,7 @@ static int korina_open(struct net_device
- 		    dev->name, lp->und_irq);
- 		goto err_free_ovr_irq;
- 	}
-+	mod_timer(&lp->media_check_timer, jiffies + 1);
- out:
- 	return ret;
- 
-@@ -1053,6 +1064,8 @@ static int korina_close(struct net_devic
- 	struct korina_private *lp = netdev_priv(dev);
- 	u32 tmp;
- 
-+	del_timer(&lp->media_check_timer);
-+
- 	/* Disable interrupts */
- 	disable_irq(lp->rx_irq);
- 	disable_irq(lp->tx_irq);
-@@ -1176,6 +1189,7 @@ static int korina_probe(struct platform_
- 			": cannot register net device %d\n", rc);
- 		goto probe_err_register;
- 	}
-+	setup_timer(&lp->media_check_timer, korina_poll_media, (unsigned long) dev);
- out:
- 	return rc;
-