diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-07-11 03:23:21 +0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-07-13 00:58:43 +0400 |
| commit | 5cc29e3bea77092c48e5c71d792c7461e6a6c4cf (patch) | |
| tree | c72c228a673d61f11e5782d564b912eabda09a64 /net | |
| parent | 95ff9f4d3cc72b62b76498290d00d129e1e62545 (diff) | |
| download | linux-5cc29e3bea77092c48e5c71d792c7461e6a6c4cf.tar.xz | |
[NETROM]: Fix locking order when establishing a NETROM circuit.
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netrom/af_netrom.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index ecc796878f38..672d5f803f8f 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, struct net_device *dev) 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; } |