diff options
| author | Benjamin Herrenschmidt | 2012-09-07 01:48:59 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt | 2012-09-07 01:48:59 +0200 |
| commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
| tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /drivers/net/macvtap.c | |
| parent | powerpc/kprobes: Rename opcode_t in probes.h to ppc_opcode_t (diff) | |
| parent | powerpc: Don't use __put_user() in patch_instruction (diff) | |
| download | kernel-qcow2-linux-fff34b3412b9401a76ba9d021db1bd91cb0e02b6.tar.gz kernel-qcow2-linux-fff34b3412b9401a76ba9d021db1bd91cb0e02b6.tar.xz kernel-qcow2-linux-fff34b3412b9401a76ba9d021db1bd91cb0e02b6.zip | |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
Diffstat (limited to 'drivers/net/macvtap.c')
| -rw-r--r-- | drivers/net/macvtap.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 0737bd4d1669..0f0f9ce3a776 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -94,7 +94,8 @@ static int get_slot(struct macvlan_dev *vlan, struct macvtap_queue *q) int i; for (i = 0; i < MAX_MACVTAP_QUEUES; i++) { - if (rcu_dereference(vlan->taps[i]) == q) + if (rcu_dereference_protected(vlan->taps[i], + lockdep_is_held(&macvtap_lock)) == q) return i; } |