---

yaml --- r: 330223 b: refs/heads/master c: b3c581d h: refs/heads/master i: 330221: 9e6e713 330219: 206d74a 330215: 561889a 330207: f741ff7 v: v3
git-mirror · Oct 4, 2012 · 8c68fe8 · 8c68fe8
1 parent c8c21b9
commit 8c68fe8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49ee49202b4ac4be95d05e4bf24a9ac8b54c5528
+refs/heads/master: b3c581d5d7130fc7f2eab9ab14c8de8882b42380
diff --git a/trunk/drivers/net/team/team.c b/trunk/drivers/net/team/team.c
@@ -1315,6 +1315,7 @@ static const struct team_option team_options[] = {
 
 static struct lock_class_key team_netdev_xmit_lock_key;
 static struct lock_class_key team_netdev_addr_lock_key;
+static struct lock_class_key team_tx_busylock_key;
 
 static void team_set_lockdep_class_one(struct net_device *dev,
 				       struct netdev_queue *txq,
@@ -1327,6 +1328,7 @@ static void team_set_lockdep_class(struct net_device *dev)
 {
 	lockdep_set_class(&dev->addr_list_lock, &team_netdev_addr_lock_key);
 	netdev_for_each_tx_queue(dev, team_set_lockdep_class_one, NULL);
+	dev->qdisc_tx_busylock = &team_tx_busylock_key;
 }
 
 static int team_init(struct net_device *dev)