From c62bd33d650c73489e9c240b0856cd472ae4cc2d Mon Sep 17 00:00:00 2001
From: Kevin Darbyshire-Bryant <kdbtomato@darbyshire-bryant.me.uk>
Date: Thu, 6 Jun 2013 15:12:15 +0100
Subject: [PATCH] Little tidy-ups

---
 release/src/router/rc/firewall.c | 4 ++++
 release/src/router/rc/network.c  | 2 +-
 release/src/router/rc/rc.h       | 1 +
 release/src/router/rc/wan.c      | 3 ++-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/release/src/router/rc/firewall.c b/release/src/router/rc/firewall.c
index 7a74a0fbbe..b42c6221d2 100644
--- a/release/src/router/rc/firewall.c
+++ b/release/src/router/rc/firewall.c
@@ -150,6 +150,10 @@ void enable_ip6_forward(void)
 		f_write_string("/proc/sys/net/ipv6/conf/default/forwarding", "1", 0, 0);
 		f_write_string("/proc/sys/net/ipv6/conf/all/forwarding", "1", 0, 0);
 	}
+	else {
+		f_write_string("/proc/sys/net/ipv6/conf/default/forwarding", "0", 0, 0);
+		f_write_string("/proc/sys/net/ipv6/conf/all/forwarding", "0", 0, 0);
+	}
 }
 #endif
 
diff --git a/release/src/router/rc/network.c b/release/src/router/rc/network.c
index 33eafba80c..e74e79ce2f 100644
--- a/release/src/router/rc/network.c
+++ b/release/src/router/rc/network.c
@@ -738,7 +738,7 @@ void start_lan(void)
 #endif
 	check_afterburner();
 #ifdef TCONFIG_IPV6
-	enable_ipv6(ipv6_enabled());
+	enable_ipv6(ipv6_enabled());  //tell Kernel to disable/enable IPv6 for most interfaces
 #endif
 	vlan0tag = nvram_get_int("vlan0tag");
 
diff --git a/release/src/router/rc/rc.h b/release/src/router/rc/rc.h
index 475efa3702..dd6d7f19b2 100644
--- a/release/src/router/rc/rc.h
+++ b/release/src/router/rc/rc.h
@@ -273,6 +273,7 @@ extern const char *chain_out_reject;
 extern char **layer7_in;
 
 extern void enable_ip_forward(void);
+extern void enable_ip6_forward(void);
 extern void ipt_write(const char *format, ...);
 extern void ip6t_write(const char *format, ...);
 #if defined(TCONFIG_IPV6) && defined(LINUX26)
diff --git a/release/src/router/rc/wan.c b/release/src/router/rc/wan.c
index 0ffd286b33..5509455d6a 100644
--- a/release/src/router/rc/wan.c
+++ b/release/src/router/rc/wan.c
@@ -314,7 +314,8 @@ static void stop_ppp(void)
 
 static void run_pppd(void)
 {
-	eval("pppd", "file", ppp_optfile);
+
+	eval("pppd", "file", (char *)ppp_optfile);
 
 	if (nvram_get_int("ppp_demand")) {
 		// demand mode
-- 
2.11.4.GIT