diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-28 13:10:55 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-28 13:10:55 +0000 |
| commit | 4fdfae5e2367e59c7199ffa3db98acdd6b592a3d (patch) | |
| tree | 7fccb07b8bd23bd181668672d0a7c71a2d0f8aba /target/linux/rb532/patches/100-check_media.patch | |
| parent | 866750add03712d91944b4ac2f31303de1c2d52c (diff) | |
[rb532] switch to 2.6.30-rc7, fixes #5111
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16134 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/rb532/patches/100-check_media.patch')
| -rw-r--r-- | target/linux/rb532/patches/100-check_media.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/target/linux/rb532/patches/100-check_media.patch b/target/linux/rb532/patches/100-check_media.patch new file mode 100644 index 0000000000..4180c62370 --- /dev/null +++ b/target/linux/rb532/patches/100-check_media.patch @@ -0,0 +1,51 @@ +--- 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; +@@ -663,6 +664,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); +@@ -1177,6 +1190,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; + |