From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 26 Feb 2011 00:05:45 +0000 (+0000)
Subject: [backfire] merge r25713
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=c367f85aae59ade88b6d711bd15ce69ae554fe6e;hp=dc205de66885d98a4f5d9eb546d405d602d87884

[backfire] merge r25713

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@25717 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/base-files/files/etc/hotplug.d/iface/10-routes b/package/base-files/files/etc/hotplug.d/iface/10-routes
index 76a406284..a36885b87 100644
--- a/package/base-files/files/etc/hotplug.d/iface/10-routes
+++ b/package/base-files/files/etc/hotplug.d/iface/10-routes
@@ -68,6 +68,9 @@ add_route6() {
 		${mtu:+mss "$mtu"}
 }
 
+# Skip fake devices (e.g. relayd)
+grep -qs "^ *$DEVICE:" /proc/net/dev || exit 0
+
 case "$ACTION" in
 	ifup)
 		include /lib/network
@@ -108,14 +111,14 @@ case "$ACTION" in
 			logger -t ifup "Allowing Router Advertisements on $INTERFACE ($DEVICE)"
 			accept_ra=2
 		}
-		do_sysctl "net.ipv6.conf.$INTERFACE.accept_ra" $accept_ra
+		do_sysctl "net.ipv6.conf.$DEVICE.accept_ra" $accept_ra
 
 		config_get_bool send_rs "$INTERFACE" send_rs $send_rs
 		[ $send_rs -eq 0 ] || {
 			logger -t ifup "Enabling Router Solicitations on $INTERFACE ($DEVICE)"
 			send_rs=2
 		}
-		do_sysctl "net.ipv6.conf.$INTERFACE.forwarding" $send_rs
+		do_sysctl "net.ipv6.conf.$DEVICE.forwarding" $send_rs
 
 
 		# Setup routes