diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2006-07-12 13:26:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-07-12 13:59:02 -0700 |
| commit | 4b260a98f1afc74cd6b73ce0616d76b441dbe8c5 (patch) | |
| tree | bba0f6b35326b0e6eba15b6ce33f3393564cc4d0 /net/netrom | |
| parent | b1d21ca83c9139e7889a754934bcdd7071157560 (diff) | |
| download | op-kernel-dev-4b260a98f1afc74cd6b73ce0616d76b441dbe8c5.zip op-kernel-dev-4b260a98f1afc74cd6b73ce0616d76b441dbe8c5.tar.gz | |
[NETROM] lockdep: fix false positive
NETROM network devices are virtual network devices encapsulating NETROM
frames into AX.25 which will be sent through an AX.25 device, so form a
special "super class" of normal net devices; split their locks off into a
separate class since they always nest.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netrom')
| -rw-r--r-- | net/netrom/af_netrom.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 672d5f8..1d50f80 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -66,6 +66,14 @@ static DEFINE_SPINLOCK(nr_list_lock); static const struct proto_ops nr_proto_ops; /* + * NETROM network devices are virtual network devices encapsulating NETROM + * frames into AX.25 which will be sent through an AX.25 device, so form a + * special "super class" of normal net devices; split their locks off into a + * separate class since they always nest. + */ +static struct lock_class_key nr_netdev_xmit_lock_key; + +/* * Socket removal during an interrupt is now safe. */ static void nr_remove_socket(struct sock *sk) @@ -1405,6 +1413,7 @@ static int __init nr_proto_init(void) free_netdev(dev); goto fail; } + lockdep_set_class(&dev->_xmit_lock, &nr_netdev_xmit_lock_key); dev_nr[i] = dev; } |
