* [NETROM] adsf
@ 2006-07-10 23:14 Ralf Baechle
2006-07-10 23:22 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Ralf Baechle @ 2006-07-10 23:14 UTC (permalink / raw)
To: David S. Miller, netdev, linux-hams
When establishing a new circuit in nr_rx_frame the locks are taken in a
different order than in the rest of the stack. This should be harmless
but triggers lockdep. Either way, reordering the code a little solves
the issue.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c
index ecc7968..672d5f8 100644
--- a/net/netrom/af_netrom.c
+++ b/net/netrom/af_netrom.c
@@ -986,18 +986,18 @@ int nr_rx_frame(struct sk_buff *skb, str
nr_make->vl = 0;
nr_make->state = NR_STATE_3;
sk_acceptq_added(sk);
-
- nr_insert_socket(make);
-
skb_queue_head(&sk->sk_receive_queue, skb);
- nr_start_heartbeat(make);
- nr_start_idletimer(make);
-
if (!sock_flag(sk, SOCK_DEAD))
sk->sk_data_ready(sk, skb->len);
bh_unlock_sock(sk);
+
+ nr_insert_socket(make);
+
+ nr_start_heartbeat(make);
+ nr_start_idletimer(make);
+
return 1;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [NETROM] adsf
2006-07-10 23:14 [NETROM] adsf Ralf Baechle
@ 2006-07-10 23:22 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2006-07-10 23:22 UTC (permalink / raw)
To: ralf; +Cc: netdev, linux-hams
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 11 Jul 2006 00:14:46 +0100
> When establishing a new circuit in nr_rx_frame the locks are taken in a
> different order than in the rest of the stack. This should be harmless
> but triggers lockdep. Either way, reordering the code a little solves
> the issue.
>
> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Care to give me a better header line than "[NETROM]: adsf"? :-)
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-07-10 23:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-10 23:14 [NETROM] adsf Ralf Baechle
2006-07-10 23:22 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).