---

yaml --- r: 351222 b: refs/heads/master c: 4cafe37 h: refs/heads/master v: v3
git-mirror · Dec 30, 2012 · 98010d5 · 98010d5
1 parent 9c89ca4
commit 98010d5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git 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
@@ -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,
 };