diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-05-15 09:28:08 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-05-15 09:28:08 -0700 |
| commit | 16daa7304e49fcb9462c15b1652bcd359b0d5156 (patch) | |
| tree | 8a27f3cee8f48e83f7a2a979a8b59586c68bf372 /include | |
| parent | 0ee2716378258ea8d3a4b5278e0f1a49d29547ca (diff) | |
[NET]: Hoplimit is a metric not a route attribute.
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ipv6_route.h | 9 | ||||
| -rw-r--r-- | include/linux/rtnetlink.h | 7 | ||||
| -rw-r--r-- | include/net/dn_fib.h | 1 | ||||
| -rw-r--r-- | include/net/ip6_fib.h | 1 | ||||
| -rw-r--r-- | include/net/ip_fib.h | 1 |
5 files changed, 4 insertions, 15 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 { diff --git a/include/net/dn_fib.h b/include/net/dn_fib.h index 322411b26c14..1396f2544118 100644 --- a/include/net/dn_fib.h +++ b/include/net/dn_fib.h @@ -19,7 +19,6 @@ struct dn_kern_rta u32 *rta_flow; struct rta_cacheinfo *rta_ci; struct rta_session *rta_sess; - u8 *rta_hoplimit; }; struct dn_fib_res { diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index d5c3dd447e25..b6927a2982b8 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -67,7 +67,6 @@ struct rt6_info u32 rt6i_flags; u32 rt6i_metric; - u8 rt6i_hoplimit; atomic_t rt6i_ref; struct rt6key rt6i_dst; diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index ff26dee6b42d..f14edafeabbd 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h @@ -38,7 +38,6 @@ struct kern_rta u32 *rta_flow; struct rta_cacheinfo *rta_ci; struct rta_session *rta_sess; - u8 *rta_hoplimit; }; struct fib_nh |