372-final: A few missing merges

VinceVal · Jul 23, 2013 · c429e02 · c429e02
1 parent 5bd89b2
commit c429e02
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/release/src/router/iproute2/include/linux/rtnetlink.h b/release/src/router/iproute2/include/linux/rtnetlink.h
@@ -737,7 +737,6 @@ enum
 	__IFLA_MAX
 };
 
-
 #define IFLA_MAX (__IFLA_MAX - 1)
 
 #define IFLA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
@@ -783,7 +782,6 @@ enum
 	IFLA_INET6_CACHEINFO,	/* time values and max reasm size */
 	__IFLA_INET6_MAX
 };
-
 #define IFLA_INET6_MAX	(__IFLA_INET6_MAX - 1)
 
 struct ifla_cacheinfo

diff --git a/release/src/router/iproute2/lib/ll_map.c b/release/src/router/iproute2/lib/ll_map.c
@@ -19,7 +19,6 @@
 #include <netinet/in.h>
 #include <net/if.h>
 #include <string.h>
-
 #include "libnetlink.h"
 #include "ll_map.h"
 

diff --git a/release/src/router/iptables/extensions/Makefile b/release/src/router/iptables/extensions/Makefile
@@ -25,7 +25,7 @@ PF_EXT_SLIB+=account
 
 ifeq ($(DO_IPV6), 1)
 PF6_EXT_SLIB:=connmark icmp6 length limit mac mark multiport standard state rt hl
-PF6_EXT_SLIB+=tcp udp CONNMARK LOG MARK IMQ TCPMSS
+PF6_EXT_SLIB+=tcp udp CONNMARK LOG MARK REJECT IMQ TCPMSS
 ifeq ($(CONFIG_LINUX26),y)
 PF6_EXT_SLIB+=connlimit hashlimit recent NFQUEUE ROUTE HL connbytes
 endif

diff --git a/release/src/router/iptables/extensions/libip6t_REJECT.c b/release/src/router/iptables/extensions/libip6t_REJECT.c
@@ -33,6 +33,8 @@ static const struct reject_names reject_table[] = {
 		IP6T_ICMP6_ADDR_UNREACH, "ICMPv6 address unreachable"},
 	{"icmp6-port-unreachable", "port-unreach",
 		IP6T_ICMP6_PORT_UNREACH, "ICMPv6 port unreachable"},
+	{"icmp6-src-addr-policy", "src-addr-policy",
+		IP6T_ICMP6_SRC_ADDR_FAIL_POLICY, "ICMPv6 src addr fails ingress/egress policy"},
 	{"tcp-reset", "tcp-reset",
 		IP6T_TCP_RESET, "TCP RST packet"}
 };

diff --git a/release/src/router/iptables/include/linux/netfilter_ipv6/ip6t_REJECT.h b/release/src/router/iptables/include/linux/netfilter_ipv6/ip6t_REJECT.h
@@ -4,8 +4,10 @@
 enum ip6t_reject_with {
 	IP6T_ICMP6_NO_ROUTE,
 	IP6T_ICMP6_ADM_PROHIBITED,
+	IP6T_ICMP6_NOT_NEIGHBOUR,
 	IP6T_ICMP6_ADDR_UNREACH,
 	IP6T_ICMP6_PORT_UNREACH,
+	IP6T_ICMP6_SRC_ADDR_FAIL_POLICY,
 	IP6T_TCP_RESET
 };