diff options
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2008-07-21 11:29:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-21 11:29:54 -0400 |
| commit | afc079465e991ffb7fe197d1ad80eb8140e2c341 (patch) | |
| tree | 19f6cfd98c123e921f0a6b3328a92521b103467f /drivers/net/gianfar.c | |
| parent | 39d48157ac1a0ff3ec81212e5451bfd1bf5f50db (diff) | |
gianfar: do not touch net queue in adjust_link phylib callback
If the net queue has not been started, we'll get this nice oops
and non-working ethernet:
PHY: 0:01 - Link is Up - 1000/Full
------------[ cut here ]------------
kernel BUG at net/core/dev.c:1328!
Oops: Exception in kernel mode, sig: 5 [#1]
MPC837x RDB
Modules linked in:
NIP: c02544a0 LR: c01a17d0 CTR: c01a16ac
REGS: cf837e40 TRAP: 0700 Not tainted (2.6.26-05253-g14b395e)
MSR: 00021032 <ME,IR,DR> CR: 22042044 XER: 00000000
TASK = cf819400[5] 'events/0' THREAD: cf836000
GPR00: c01a17d0 cf837ef0 cf819400 c03d8d08 cf8469a0 00000064 00000000 00000000
GPR08: c03d8d08 00000001 00000001 cf899ba0 22044044 00000000 0fffd000 00000000
GPR16: 0fff3028 0fff6cf0 00000000 0fff8390 0ff494a0 00000004 00000000 00000000
GPR24: c0361a00 00001058 cf9f6600 00009032 cf846800 cf846b80 00000001 00000014
NIP [c02544a0] __netif_schedule+0x28/0x8c
LR [c01a17d0] adjust_link+0x124/0x1cc
Call Trace:
[cf837ef0] [c03fb3a0] 0xc03fb3a0 (unreliable)
[cf837f10] [c01a17d0] adjust_link+0x124/0x1cc
[cf837f40] [c01a8e28] phy_state_machine+0x2e0/0x448
[cf837f60] [c0040254] run_workqueue+0xc8/0x168
[cf837f90] [c00408d8] worker_thread+0x70/0xd0
[cf837fd0] [c0044630] kthread+0x48/0x84
[cf837ff0] [c0012610] kernel_thread+0x44/0x60
Instruction dump:
7c0803a6 4e800020 3d20c03e 9421ffe0 7c0802a6 7c681b78 39298d08 7c694a78
7d290034 90010024 bfa10014 5529d97e <0f090000> 39600002 38030024 7d200028
---[ end trace 13dfd73ee42d0c30 ]---
Since the driver is using phylib (which is doing netif_carrier_on/off()),
we should simply remove netif_tx_schedule_all() from adjust_link().
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/gianfar.c')
| -rw-r--r-- | drivers/net/gianfar.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 45a63172852f..39b45e901be6 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
| @@ -1725,7 +1725,6 @@ static void adjust_link(struct net_device *dev) | |||
| 1725 | if (!priv->oldlink) { | 1725 | if (!priv->oldlink) { |
| 1726 | new_state = 1; | 1726 | new_state = 1; |
| 1727 | priv->oldlink = 1; | 1727 | priv->oldlink = 1; |
| 1728 | netif_tx_schedule_all(dev); | ||
| 1729 | } | 1728 | } |
| 1730 | } else if (priv->oldlink) { | 1729 | } else if (priv->oldlink) { |
| 1731 | new_state = 1; | 1730 | new_state = 1; |