From 8c68fe85ed1a65228eb2fd6fefab9e497ca0ea84 Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Wed, 3 Oct 2012 23:18:39 +0000 Subject: [PATCH] --- yaml --- r: 330223 b: refs/heads/master c: b3c581d5d7130fc7f2eab9ab14c8de8882b42380 h: refs/heads/master i: 330221: 9e6e7131f62e7c19f449e71a81a3a711ce013abf 330219: 206d74aa55d51ce4decea7a202c632dbbb2690a7 330215: 561889a67b5fa0b3f0cc5821f006bc63e309d459 330207: f741ff78615bd973a1bad6e33b191b0d00e36ea6 v: v3 --- [refs] | 2 +- trunk/drivers/net/team/team.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 648121180741..f27db81c703e 100644 --- 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 index 5c7547c4f802..d44cca327588 100644 --- 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)