diff --git a/[refs] b/[refs]
index 3c78ce908a4a..4c416f1d8f75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6230c9b4f8957c8938ee4cf2d03166d3c2dc89de
+refs/heads/master: d5123480b1d6f7d1a5fe1a13520cef88fb5d4c84
diff --git a/trunk/drivers/net/netconsole.c b/trunk/drivers/net/netconsole.c
index ed2a3977c6e7..e8882023576b 100644
--- a/trunk/drivers/net/netconsole.c
+++ b/trunk/drivers/net/netconsole.c
@@ -307,6 +307,11 @@ static ssize_t store_enabled(struct netconsole_target *nt,
 		return err;
 	if (enabled < 0 || enabled > 1)
 		return -EINVAL;
+	if (enabled == nt->enabled) {
+		printk(KERN_INFO "netconsole: network logging has already %s\n",
+				nt->enabled ? "started" : "stopped");
+		return -EINVAL;
+	}
 
 	if (enabled) {	/* 1 */