diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 15:13:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 15:13:53 -0700 |
| commit | 90ca9a2ff4d6b89b6939c3ece19f8fed1eecdbab (patch) | |
| tree | c671df0bd9fa1a13da69ec57e3fdda1385e59729 /drivers | |
| parent | 2c87e2cd0b57f63c226cd51f55ccc36867541a24 (diff) | |
| parent | 9faefb6d41f770e9cebad0fa180e7e78ef861211 (diff) | |
| download | blackbird-op-linux-90ca9a2ff4d6b89b6939c3ece19f8fed1eecdbab.tar.gz blackbird-op-linux-90ca9a2ff4d6b89b6939c3ece19f8fed1eecdbab.zip | |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD
* HEAD:
[DCCP]: Fix sparse warnings.
[TCP]: Remove TCP Compound
[BPQ] lockdep: fix false positive
[IPV4] inetpeer: Get rid of volatile from peer_total
[AX.25]: Get rid of the last volatile.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/hamradio/bpqether.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index 0641f54fc638..889f338132fa 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c @@ -122,6 +122,12 @@ struct bpqdev { static LIST_HEAD(bpq_devices); +/* + * bpqether network devices are paired with ethernet devices below them, so + * form a special "super class" of normal ethernet devices; split their locks + * off into a separate class since they always nest. + */ +static struct lock_class_key bpq_netdev_xmit_lock_key; /* ------------------------------------------------------------------------ */ @@ -528,6 +534,7 @@ static int bpq_new_device(struct net_device *edev) err = register_netdevice(ndev); if (err) goto error; + lockdep_set_class(&ndev->_xmit_lock, &bpq_netdev_xmit_lock_key); /* List protected by RTNL */ list_add_rcu(&bpq->bpq_list, &bpq_devices); |
