From 98010d507cef6b825d3c02d2dc385dc1ae34aadb Mon Sep 17 00:00:00 2001
From: Flavio Leitner <fbl@redhat.com>
Date: Sat, 29 Dec 2012 15:31:01 +0000
Subject: [PATCH] --- yaml --- r: 351222 b: refs/heads/master c:
 4cafe373d40dd9893a301fa83dc99abb80a2bd0b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index bdad746e9cc2..455c90c57e25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 576eb62598f10c8c7fd75703fe89010cdcfff596
+refs/heads/master: 4cafe373d40dd9893a301fa83dc99abb80a2bd0b
diff --git a/trunk/drivers/net/team/team.c b/trunk/drivers/net/team/team.c
index ad86660fb8f9..27a6edeb376f 100644
--- a/trunk/drivers/net/team/team.c
+++ b/trunk/drivers/net/team/team.c
@@ -1707,6 +1707,15 @@ static netdev_features_t team_fix_features(struct net_device *dev,
 	return features;
 }
 
+static int team_change_carrier(struct net_device *dev, bool new_carrier)
+{
+	if (new_carrier)
+		netif_carrier_on(dev);
+	else
+		netif_carrier_off(dev);
+	return 0;
+}
+
 static const struct net_device_ops team_netdev_ops = {
 	.ndo_init		= team_init,
 	.ndo_uninit		= team_uninit,
@@ -1729,6 +1738,7 @@ static const struct net_device_ops team_netdev_ops = {
 	.ndo_add_slave		= team_add_slave,
 	.ndo_del_slave		= team_del_slave,
 	.ndo_fix_features	= team_fix_features,
+	.ndo_change_carrier     = team_change_carrier,
 };