---

yaml --- r: 351215 b: refs/heads/master c: 210ab66 h: refs/heads/master i: 351213: f111e97 351211: 870c4a2 351207: 6dab677 351199: 2428105 v: v3
git-mirror · Dec 28, 2012 · 4b5c1e2 · 4b5c1e2
1 parent 16a7dd3
commit 4b5c1e2
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: 9a57247f31e361f80508c40363366222dbbb6aa5
+refs/heads/master: 210ab6656fa8c49d7238c13f85ed551ebab94fb0
diff --git a/trunk/drivers/net/dummy.c b/trunk/drivers/net/dummy.c
@@ -100,6 +100,15 @@ static void dummy_dev_uninit(struct net_device *dev)
 	free_percpu(dev->dstats);
 }
 
+static int dummy_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 dummy_netdev_ops = {
 	.ndo_init		= dummy_dev_init,
 	.ndo_uninit		= dummy_dev_uninit,
@@ -108,6 +117,7 @@ static const struct net_device_ops dummy_netdev_ops = {
 	.ndo_set_rx_mode	= set_multicast_list,
 	.ndo_set_mac_address	= eth_mac_addr,
 	.ndo_get_stats64	= dummy_get_stats64,
+	.ndo_change_carrier	= dummy_change_carrier,
 };
 
 static void dummy_setup(struct net_device *dev)