summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ipv6_route.h9
-rw-r--r--include/linux/rtnetlink.h7
2 files changed, 4 insertions, 12 deletions
diff --git a/include/linux/ipv6_route.h b/include/linux/ipv6_route.h
index a4861d0535af..eacfa6c80f0e 100644
--- a/include/linux/ipv6_route.h
+++ b/include/linux/ipv6_route.h
@@ -13,15 +13,6 @@
#ifndef _LINUX_IPV6_ROUTE_H
#define _LINUX_IPV6_ROUTE_H
-enum
-{
- RTA_IPV6_UNSPEC,
- RTA_IPV6_HOPLIMIT,
-};
-
-#define RTA_IPV6_MAX RTA_IPV6_HOPLIMIT
-
-
#define RTF_DEFAULT 0x00010000 /* default - learned via ND */
#define RTF_ALLONLINK 0x00020000 /* fallback, no routers on link */
#define RTF_ADDRCONF 0x00040000 /* addrconf route - RA */
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 0466f6cdbd7f..1b0998fd604f 100644
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -201,10 +201,9 @@ enum rtattr_type_t
RTA_FLOW,
RTA_CACHEINFO,
RTA_SESSION,
- RTA_HOPLIMIT,
};
-#define RTA_MAX RTA_HOPLIMIT
+#define RTA_MAX RTA_SESSION
#define RTM_RTA(r) ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct rtmsg))))
#define RTM_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct rtmsg))
@@ -283,9 +282,11 @@ enum
#define RTAX_ADVMSS RTAX_ADVMSS
RTAX_REORDERING,
#define RTAX_REORDERING RTAX_REORDERING
+ RTAX_HOPLIMIT,
+#define RTAX_HOPLIMIT RTAX_HOPLIMIT
};
-#define RTAX_MAX RTAX_REORDERING
+#define RTAX_MAX RTAX_HOPLIMIT
struct rta_session
{