diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/net/dst.h | 2 | ||||
-rw-r--r-- | include/net/ip_fib.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/net/dst.h b/include/net/dst.h index a5bd72646d65..6baba836ad8b 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
@@ -72,7 +72,7 @@ struct dst_entry { | |||
72 | 72 | ||
73 | u32 metrics[RTAX_MAX]; | 73 | u32 metrics[RTAX_MAX]; |
74 | 74 | ||
75 | #ifdef CONFIG_NET_CLS_ROUTE | 75 | #ifdef CONFIG_IP_ROUTE_CLASSID |
76 | __u32 tclassid; | 76 | __u32 tclassid; |
77 | #else | 77 | #else |
78 | __u32 __pad2; | 78 | __u32 __pad2; |
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 07bdb5e9e8ac..65d1fcdbc63b 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h | |||
@@ -55,7 +55,7 @@ struct fib_nh { | |||
55 | int nh_weight; | 55 | int nh_weight; |
56 | int nh_power; | 56 | int nh_power; |
57 | #endif | 57 | #endif |
58 | #ifdef CONFIG_NET_CLS_ROUTE | 58 | #ifdef CONFIG_IP_ROUTE_CLASSID |
59 | __u32 nh_tclassid; | 59 | __u32 nh_tclassid; |
60 | #endif | 60 | #endif |
61 | int nh_oif; | 61 | int nh_oif; |
@@ -201,7 +201,7 @@ static inline int fib_lookup(struct net *net, const struct flowi *flp, | |||
201 | extern int __net_init fib4_rules_init(struct net *net); | 201 | extern int __net_init fib4_rules_init(struct net *net); |
202 | extern void __net_exit fib4_rules_exit(struct net *net); | 202 | extern void __net_exit fib4_rules_exit(struct net *net); |
203 | 203 | ||
204 | #ifdef CONFIG_NET_CLS_ROUTE | 204 | #ifdef CONFIG_IP_ROUTE_CLASSID |
205 | extern u32 fib_rules_tclass(struct fib_result *res); | 205 | extern u32 fib_rules_tclass(struct fib_result *res); |
206 | #endif | 206 | #endif |
207 | 207 | ||
@@ -235,7 +235,7 @@ extern struct fib_table *fib_hash_table(u32 id); | |||
235 | 235 | ||
236 | static inline void fib_combine_itag(u32 *itag, struct fib_result *res) | 236 | static inline void fib_combine_itag(u32 *itag, struct fib_result *res) |
237 | { | 237 | { |
238 | #ifdef CONFIG_NET_CLS_ROUTE | 238 | #ifdef CONFIG_IP_ROUTE_CLASSID |
239 | #ifdef CONFIG_IP_MULTIPLE_TABLES | 239 | #ifdef CONFIG_IP_MULTIPLE_TABLES |
240 | u32 rtag; | 240 | u32 rtag; |
241 | #endif | 241 | #endif |