diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
| commit | 6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (patch) | |
| tree | cd71e597bbbe677820bb229c6aedbad412758959 /include/net/route.h | |
| parent | d6f03f29f7cdf064289f941bf0b838348e996e65 (diff) | |
| parent | fc0b927d9a5024e138c4318fe19a590f23e3eeec (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv4/inet_diag.c
Diffstat (limited to 'include/net/route.h')
| -rw-r--r-- | include/net/route.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/route.h b/include/net/route.h index db7b3432f07c..91855d185b53 100644 --- a/include/net/route.h +++ b/include/net/route.h | |||
| @@ -71,12 +71,12 @@ struct rtable { | |||
| 71 | struct fib_info *fi; /* for client ref to shared metrics */ | 71 | struct fib_info *fi; /* for client ref to shared metrics */ |
| 72 | }; | 72 | }; |
| 73 | 73 | ||
| 74 | static inline bool rt_is_input_route(struct rtable *rt) | 74 | static inline bool rt_is_input_route(const struct rtable *rt) |
| 75 | { | 75 | { |
| 76 | return rt->rt_route_iif != 0; | 76 | return rt->rt_route_iif != 0; |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | static inline bool rt_is_output_route(struct rtable *rt) | 79 | static inline bool rt_is_output_route(const struct rtable *rt) |
| 80 | { | 80 | { |
| 81 | return rt->rt_route_iif == 0; | 81 | return rt->rt_route_iif == 0; |
| 82 | } | 82 | } |