lib8390: Fix locking in ei_poll (poll controller)
authorJarek Poplawski <jarkao2@gmail.com>
Tue, 30 Sep 2008 20:58:25 +0000 (20:58 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 8 Oct 2008 23:56:48 +0000 (16:56 -0700)
commitf47aeffd6089ed7a0cd18073e88cd505f188b0b7
tree5020fbc523db172782cc873da178f6cfd78d06d6
parent23e55a32ca1ffdbe7a492ef99f0e0ac48e504a13
lib8390: Fix locking in ei_poll (poll controller)

This lockdep warning:
  =================================
  [ INFO: inconsistent lock state ]
  2.6.27-rc7 #3
  ---------------------------------
  inconsistent {in-softirq-W} -> {softirq-on-W} usage.
  syslogd/2474 [HC0[0]:SC0[0]:HE1:SE1] takes:
   (_xmit_ETHER#2){-+..}, at: [<c0265562>] netpoll_send_skb+0x132/0x190
  ...

is caused by unconditional local_irq_disable()/local_irq_enable() in
disable_irq_lockdep()/enable_irq_lockdep() used by __ei_poll(). Since
netconsole/netpoll always calls dev->poll_controller() with local irqs
disabled, disable_irq()/enable_irq() instead is safe and enough (like
e.g. in 3c509 or 8139xx drivers).

Reported-and-tested-by: Bernard Pidoux F6BVP <f6bvp@free.fr>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/lib8390.c