net/802/mrp: fix lockdep splat
authorEric Dumazet <edumazet@google.com>
Mon, 13 May 2013 02:24:11 +0000 (02:24 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 May 2013 20:02:30 +0000 (13:02 -0700)
commitfaff57a92ba1d7247c5e86ecea2886d2c9d54507
tree8e9fbdb7e277f538867bffa5f2bf6588310f4e09
parenta3659aa09a2ee7e0028349b9100d8b4a7750a4be
net/802/mrp: fix lockdep splat

commit fb745e9a037895 ("net/802/mrp: fix possible race condition when
calling mrp_pdu_queue()") introduced a lockdep splat.

[   19.735147] =================================
[   19.735235] [ INFO: inconsistent lock state ]
[   19.735324] 3.9.2-build-0063 #4 Not tainted
[   19.735412] ---------------------------------
[   19.735500] inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage.
[   19.735592] rmmod/1840 [HC0[0]:SC0[0]:HE1:SE1] takes:
[   19.735682]  (&(&app->lock)->rlock#2){+.?...}, at: [<f862bb5b>]
mrp_uninit_applicant+0x69/0xba [mrp]

app->lock is normally taken under softirq context, so disable BH to
avoid the splat.

Reported-by: Denys Fedoryshchenko <denys@visp.net.lb>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: David Ward <david.ward@ll.mit.edu>
Cc: Cong Wang <amwang@redhat.com>
Tested-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/802/mrp.c