Eric Dumazet faff57a92b net/802/mrp: fix lockdep splat ... commit fb745e9a03 ("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>		2013-05-14 13:02:30 -07:00
..
9p	Lots of virtio work which wasn't quite ready for last merge window. Plus	2013-05-02 14:14:04 -07:00
802	net/802/mrp: fix lockdep splat	2013-05-14 13:02:30 -07:00
8021q	net: vlan,ethtool: netdev_features_t is more than 32 bit	2013-05-02 13:58:12 -04:00
appletalk
atm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
ax25
batman-adv	batman-adv: reorder clean up routine in order to avoid race conditions	2013-05-09 12:39:45 +02:00
bluetooth	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
bridge	bridge: fix race with topology change timer	2013-05-03 16:08:58 -04:00
caif
can	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
ceph	libceph: use slab cache for osd client requests	2013-05-02 11:58:41 -05:00
core	ipv6: do not clear pinet6 field	2013-05-11 16:26:38 -07:00
dcb
dccp
decnet
dns_resolver
dsa
ethernet
ieee802154
ipv4	tcp: fix tcp_md5_hash_skb_data()	2013-05-14 11:32:04 -07:00
ipv6	xfrm6: release dev before returning error	2013-05-11 17:40:15 -07:00
ipx
irda	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-05-01 14:08:52 -07:00
iucv
key
l2tp
lapb
llc
mac80211
mac802154
netfilter	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
netlabel
netlink
netrom
nfc
openvswitch
packet	packet: tpacket_v3: do not trigger bug() on wrong header status	2013-05-03 16:10:33 -04:00
phonet
rds
rfkill
rose
rxrpc
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-05-01 14:08:52 -07:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-05-01 14:08:52 -07:00
sunrpc	Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux	2013-05-10 09:28:55 -07:00
tipc	tipc: potential divide by zero in tipc_link_recv_fragment()	2013-05-06 16:16:52 -04:00
unix
vmw_vsock
wimax
wireless	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
x25
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2013-05-02 14:53:12 -07:00
compat.c
Kconfig
Makefile
nonet.c
socket.c	Merge git://git.infradead.org/users/eparis/audit	2013-05-11 14:29:11 -07:00
sysctl_net.c