From 520476ff9bbb7db2bda7bf727f64a1937047f9ac Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jpirko@redhat.com>
Date: Wed, 10 Aug 2011 06:09:44 +0000
Subject: [PATCH] --- yaml --- r: 265227 b: refs/heads/master c:
 d5da4510a742bb85182dcab8a47f63baaebb5ec3 h: refs/heads/master i:   265225:
 28846a46089ca1978c036ea1e40572a5d1dd4bd8   265223:
 e640b2656b1af3a3efb4713f77b725ab70b38ad5 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/bonding/bond_main.c | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a4c79f1f8caf..7afb119d24a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5098af0abf3c1ed454159e081e75cf7cfc6ddf60
+refs/heads/master: d5da4510a742bb85182dcab8a47f63baaebb5ec3
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
index 38a83acd502e..854aa8d3a2e0 100644
--- a/trunk/drivers/net/bonding/bond_main.c
+++ b/trunk/drivers/net/bonding/bond_main.c
@@ -4828,11 +4828,20 @@ static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
 	return 0;
 }
 
+static int bond_get_tx_queues(struct net *net, struct nlattr *tb[],
+			      unsigned int *num_queues,
+			      unsigned int *real_num_queues)
+{
+	*num_queues = tx_queues;
+	return 0;
+}
+
 static struct rtnl_link_ops bond_link_ops __read_mostly = {
 	.kind		= "bond",
 	.priv_size	= sizeof(struct bonding),
 	.setup		= bond_setup,
 	.validate	= bond_validate,
+	.get_tx_queues	= bond_get_tx_queues,
 };
 
 /* Create a new bond based on the specified name and bonding parameters.