3 files changed, 11 insertions, 4 deletions
diff --git a/sysconfig/network-scripts/ifdown-tunnel b/sysconfig/network-scripts/ifdown-tunnel
index f764f9bd..a5384b18 100755
--- a/sysconfig/network-scripts/ifdown-tunnel
+++ b/sysconfig/network-scripts/ifdown-tunnel
@@ -32,7 +32,7 @@ need_config "$CONFIG"
 source_config
 
 # Generic tunnel devices are not supported here
-if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 ]; then
+if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 -o "$DEVICE" = ip6tnl0 ]; then
     net_log $"Device '$DEVICE' isn't supported as a valid GRE device name."
     exit 1
 fi
diff --git a/sysconfig/network-scripts/ifup-tunnel b/sysconfig/network-scripts/ifup-tunnel
index 49c52c0b..2eaa4bb7 100755
--- a/sysconfig/network-scripts/ifup-tunnel
+++ b/sysconfig/network-scripts/ifup-tunnel
@@ -39,12 +39,19 @@ fi
 case "$TYPE" in
     GRE)
 	MODE=gre
+	proto=-4
 	/sbin/modprobe ip_gre
 	;;
     IPIP)
 	MODE=ipip
+	proto=-4
 	/sbin/modprobe ipip
 	;;
+    IPIP6)
+	MODE=ipip6
+	proto=-6
+	/sbin/modprobe ip6_tunnel
+	;;
     *)
 	net_log $"Invalid tunnel type $TYPE"
 	exit 1
@@ -52,14 +59,14 @@ case "$TYPE" in
 esac
 
 # Generic tunnel devices are not supported here
-if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 ]; then
+if [ "$DEVICE" = gre0 -o "$DEVICE" = tunl0 -o "$DEVICE" = ip6tnl0 ]; then
     net_log $"Device '$DEVICE' isn't supported as a valid GRE device name."
     exit 1
 fi
 
 # Create the tunnel
 # The outer addresses are those of the underlying (public) network.
-/sbin/ip tunnel add "$DEVICE" mode "$MODE" \
+/sbin/ip $proto tunnel add "$DEVICE" mode "$MODE" \
     ${MY_OUTER_IPADDR:+local "$MY_OUTER_IPADDR"} \
     ${PEER_OUTER_IPADDR:+remote "$PEER_OUTER_IPADDR"} \
     ${KEY:+key "$KEY"} ${TTL:+ttl "$TTL"}
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index bbfa35b0..d240df35 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -141,7 +141,7 @@ source_config ()
 	CTC)
 		DEVICETYPE="ctc"
 		;;
-	GRE | IPIP)
+	GRE | IPIP | IPIP6)
 		DEVICETYPE="tunnel"
 		;;
 	SIT | sit)