From f6e9670241ab2a5dc45bbc24dd8c5950d28da4b4 Mon Sep 17 00:00:00 2001
From: Flavio Leitner <fbl@redhat.com>
Date: Sat, 29 Dec 2012 16:37:33 +0000
Subject: [PATCH] --- yaml --- r: 351225 b: refs/heads/master c:
 7f51c58731dfb0ef88ff283851a4710cc3335788 h: refs/heads/master i:   351223:
 7463c5f683c00520ca1e1467c7d1dcbc13642401 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/net/team/team.c | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 576a10f874be..0d0cf08c77cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8093315a91340bca52549044975d8c7f673b28a1
+refs/heads/master: 7f51c58731dfb0ef88ff283851a4710cc3335788
diff --git a/trunk/drivers/net/team/team.c b/trunk/drivers/net/team/team.c
index 27a6edeb376f..918a901754b6 100644
--- a/trunk/drivers/net/team/team.c
+++ b/trunk/drivers/net/team/team.c
@@ -28,6 +28,7 @@
 #include <net/genetlink.h>
 #include <net/netlink.h>
 #include <net/sch_generic.h>
+#include <generated/utsrelease.h>
 #include <linux/if_team.h>
 
 #define DRV_NAME "team"
@@ -1741,6 +1742,21 @@ static const struct net_device_ops team_netdev_ops = {
 	.ndo_change_carrier     = team_change_carrier,
 };
 
+/***********************
+ * ethtool interface
+ ***********************/
+
+static void team_ethtool_get_drvinfo(struct net_device *dev,
+				     struct ethtool_drvinfo *drvinfo)
+{
+	strncpy(drvinfo->driver, DRV_NAME, 32);
+	strncpy(drvinfo->version, UTS_RELEASE, 32);
+}
+
+static const struct ethtool_ops team_ethtool_ops = {
+	.get_drvinfo		= team_ethtool_get_drvinfo,
+	.get_link		= ethtool_op_get_link,
+};
 
 /***********************
  * rt netlink interface
@@ -1790,6 +1806,7 @@ static void team_setup(struct net_device *dev)
 	ether_setup(dev);
 
 	dev->netdev_ops = &team_netdev_ops;
+	dev->ethtool_ops = &team_ethtool_ops;
 	dev->destructor	= team_destructor;
 	dev->tx_queue_len = 0;
 	dev->flags |= IFF_MULTICAST;