mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-03 22:44:27 -05:00 
			
		
		
		
	
		
			
				
	
	
		
			51 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			51 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From: Jonas Gorski <jogo@openwrt.org>
 | 
						|
Subject: net: provide defines for _POLICY_FAILED until all code is updated
 | 
						|
 | 
						|
Upstream introduced ICMPV6_POLICY_FAIL for code 5 of destination
 | 
						|
unreachable, conflicting with our name.
 | 
						|
 | 
						|
Add appropriate defines to allow our code to build with the new
 | 
						|
name until we have updated our local patches for older kernels
 | 
						|
and userspace packages.
 | 
						|
 | 
						|
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 | 
						|
---
 | 
						|
 include/uapi/linux/fib_rules.h | 2 ++
 | 
						|
 include/uapi/linux/icmpv6.h    | 2 ++
 | 
						|
 include/uapi/linux/rtnetlink.h | 2 ++
 | 
						|
 3 files changed, 6 insertions(+)
 | 
						|
 | 
						|
--- a/include/uapi/linux/fib_rules.h
 | 
						|
+++ b/include/uapi/linux/fib_rules.h
 | 
						|
@@ -89,6 +89,8 @@ enum {
 | 
						|
 	__FR_ACT_MAX,
 | 
						|
 };
 | 
						|
 
 | 
						|
+#define FR_ACT_FAILED_POLICY FR_ACT_POLICY_FAILED
 | 
						|
+
 | 
						|
 #define FR_ACT_MAX (__FR_ACT_MAX - 1)
 | 
						|
 
 | 
						|
 #endif
 | 
						|
--- a/include/uapi/linux/icmpv6.h
 | 
						|
+++ b/include/uapi/linux/icmpv6.h
 | 
						|
@@ -126,6 +126,8 @@ struct icmp6hdr {
 | 
						|
 #define ICMPV6_POLICY_FAIL		5
 | 
						|
 #define ICMPV6_REJECT_ROUTE		6
 | 
						|
 
 | 
						|
+#define ICMPV6_FAILED_POLICY		ICMPV6_POLICY_FAIL
 | 
						|
+
 | 
						|
 /*
 | 
						|
  *	Codes for Time Exceeded
 | 
						|
  */
 | 
						|
--- a/include/uapi/linux/rtnetlink.h
 | 
						|
+++ b/include/uapi/linux/rtnetlink.h
 | 
						|
@@ -253,6 +253,8 @@ enum {
 | 
						|
 	__RTN_MAX
 | 
						|
 };
 | 
						|
 
 | 
						|
+#define RTN_FAILED_POLICY RTN_POLICY_FAILED
 | 
						|
+
 | 
						|
 #define RTN_MAX (__RTN_MAX - 1)
 | 
						|
 
 | 
						|
 
 |