3 files changed, 12 insertions, 0 deletions

diff --git a/include/linux/if.h b/include/linux/if.h
index 186070d5c544..5c9d1fa93fef 100644
--- a/include/linux/if.h
+++ b/include/linux/if.h
@@ -63,6 +63,7 @@
 #define IFF_MASTER_ALB  0x10            /* bonding master, balance-alb. */
 #define IFF_BONDING     0x20            /* bonding master or slave      */
 #define IFF_SLAVE_NEEDARP 0x40          /* need ARPs for validation     */
+#define IFF_ISATAP      0x80            /* ISATAP interface (RFC4214)   */
 
 #define IF_GET_IFACE    0x0001          /* for querying only */
 #define IF_GET_PROTO    0x0002
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index 660b5010c2d9..228eb4eb3129 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -17,6 +17,9 @@
 #define GRE_FLAGS       __constant_htons(0x00F8)
 #define GRE_VERSION     __constant_htons(0x0007)
 
+/* i_flags values for SIT mode */
+#define SIT_ISATAP      0x0001
+
 struct ip_tunnel_parm
 {
         char                    name[IFNAMSIZ];
diff --git a/include/linux/in.h b/include/linux/in.h
index 3975cbf52f20..a8f00cac8f79 100644
--- a/include/linux/in.h
+++ b/include/linux/in.h
@@ -253,6 +253,14 @@ struct sockaddr_in {
 #define ZERONET(x)      (((x) & htonl(0xff000000)) == htonl(0x00000000))
 #define LOCAL_MCAST(x)  (((x) & htonl(0xFFFFFF00)) == htonl(0xE0000000))
 
+/* Special-Use IPv4 Addresses (RFC3330) */
+#define PRIVATE_10(x)   (((x) & htonl(0xff000000)) == htonl(0x0A000000))
+#define LINKLOCAL_169(x) (((x) & htonl(0xffff0000)) == htonl(0xA9FE0000))
+#define PRIVATE_172(x)  (((x) & htonl(0xfff00000)) == htonl(0xAC100000))
+#define TEST_192(x)     (((x) & htonl(0xffffff00)) == htonl(0xC0000200))
+#define ANYCAST_6TO4(x) (((x) & htonl(0xffffff00)) == htonl(0xC0586300))
+#define PRIVATE_192(x)  (((x) & htonl(0xffff0000)) == htonl(0xC0A80000))
+#define TEST_198(x)     (((x) & htonl(0xfffe0000)) == htonl(0xC6120000))
 #endif
 
 #endif  /* _LINUX_IN_H */