From: osdl.net!shemminger <osdl.net!shemminger>
Date: Wed, 30 Mar 2005 18:43:30 +0000 (+0000)
Subject: update to latest from 2.6.12-rc2
X-Git-Tag: v2_6_11-050314~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=206a04411c9dec5651243efe4c3d0c237f4e780d;p=thirdparty%2Fiproute2.git

update to latest from 2.6.12-rc2

(Logical change 1.181)
---

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 1facfe9cd..fdc8b742a 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -250,6 +250,7 @@ enum rtattr_type_t
 	RTA_FLOW,
 	RTA_CACHEINFO,
 	RTA_SESSION,
+	RTA_MP_ALGO,
 	__RTA_MAX
 };
 
@@ -346,6 +347,7 @@ enum
 #define RTAX_FEATURE_ECN	0x00000001
 #define RTAX_FEATURE_SACK	0x00000002
 #define RTAX_FEATURE_TIMESTAMP	0x00000004
+#define RTAX_FEATURE_ALLFRAG	0x00000008
 
 struct rta_session
 {
@@ -396,6 +398,19 @@ enum
 
 #define IFA_MAX (__IFA_MAX - 1)
 
+/*
+ * Quirk for IPv4 address deletion to allow exact deletion of equal
+ * addresses varying only in prefix length. A explicit exact comparison
+ * of the prefix length will only be done if IFA_PREFIX_EXACT_DEL is
+ * ORed to ifa_prefixlen.
+ *
+ * Note: This special treatment is only understood while deleting
+ *       addresses and will lead to unexpected behaviour if used
+ *       otherwise.
+ */
+#define IFA_PREFIX_EXACT_DEL	0x40
+#define IFA_REAL_DEL_PREFIX(l)	((l) & 0x3f)
+
 /* ifa_flags */
 
 #define IFA_F_SECONDARY		0x01
@@ -446,6 +461,7 @@ enum
 	NDA_DST,
 	NDA_LLADDR,
 	NDA_CACHEINFO,
+	NDA_PROBES,
 	__NDA_MAX
 };
 
@@ -699,7 +715,6 @@ enum
 	TCA_RATE,
 	TCA_FCNT,
 	TCA_STATS2,
-	TCA_ACT_STATS,
 	__TCA_MAX
 };