diff options
| author | Nicolas Thill <nico@openwrt.org> | 2010-05-24 20:35:46 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2010-05-24 20:35:46 +0000 |
| commit | 46e2eea1efc7037bf730d9885c3991be00c9b451 (patch) | |
| tree | a0b05252bde69edc60654abd103ce0a2cdea830a /target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch | |
| parent | a93571825f040d24c12c6071dab32a5d98018091 (diff) | |
| download | mtk-20170518-46e2eea1efc7037bf730d9885c3991be00c9b451.zip mtk-20170518-46e2eea1efc7037bf730d9885c3991be00c9b451.tar.gz mtk-20170518-46e2eea1efc7037bf730d9885c3991be00c9b451.tar.bz2 | |
target/linux: refresh 2.6.32 patches
SVN-Revision: 21566
Diffstat (limited to 'target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch')
| -rw-r--r-- | target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch b/target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch index 41be86a..f56c40f 100644 --- a/target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch +++ b/target/linux/rdc/patches-2.6.32/013-r6040_fix_mii_check_media.patch @@ -1,8 +1,6 @@ -diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c -index 4122916..eeee379 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c -@@ -400,9 +400,6 @@ static void r6040_init_mac_regs(struct net_device *dev) +@@ -401,9 +401,6 @@ static void r6040_init_mac_regs(struct n * we may got called by r6040_tx_timeout which has left * some unsent tx buffers */ iowrite16(0x01, ioaddr + MTPR); @@ -12,7 +10,7 @@ index 4122916..eeee379 100644 } static void r6040_tx_timeout(struct net_device *dev) -@@ -530,8 +527,6 @@ static int r6040_phy_mode_chk(struct net_device *dev) +@@ -531,8 +528,6 @@ static int r6040_phy_mode_chk(struct net phy_dat = 0x0000; } @@ -21,7 +19,7 @@ index 4122916..eeee379 100644 return phy_dat; }; -@@ -813,6 +808,9 @@ static void r6040_timer(unsigned long data) +@@ -814,6 +809,9 @@ static void r6040_timer(unsigned long da /* Timer active again */ mod_timer(&lp->timer, round_jiffies(jiffies + HZ)); |