From 4b5c1e240f2663f28f5c2ce0934b5811ce19bea0 Mon Sep 17 00:00:00 2001
From: Jiri Pirko <jiri@resnulli.us>
Date: Thu, 27 Dec 2012 23:49:40 +0000
Subject: [PATCH] --- yaml --- r: 351215 b: refs/heads/master c:
 210ab6656fa8c49d7238c13f85ed551ebab94fb0 h: refs/heads/master i:   351213:
 f111e97b9bd949543177eca23e3eabd419cdcfe0   351211:
 870c4a2a263bd65c8445a3c4b1f9a430b9900804   351207:
 6dab67771c7d4d4529a5006b99bd5e21437ef074   351199:
 24281050f90729a78ba66a523d5d09d7f63f8baa v: v3

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

diff --git a/[refs] b/[refs]
index 411bcace26cf..d3c8a950d78f 100644
--- 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
index c260af5411d0..42aa54af6842 100644
--- 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)