---

yaml --- r: 321597 b: refs/heads/master c: 3a7f8c3 h: refs/heads/master i: 321595: 7341353 v: v3
git-mirror · Aug 12, 2012 · ce7bce3 · ce7bce3
1 parent b167385
commit ce7bce3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2359a47671fc4fb0fe5e9945f76c2cb10792c0f8
+refs/heads/master: 3a7f8c34fefb109903af9a0fac6d0d05f93335c5
diff --git a/trunk/drivers/net/macvtap.c b/trunk/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;
 	}