diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-07 14:05:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-07 14:05:23 -0700 |
| commit | c1e48efc701b79ee4367c9a1a4e8bbc7c3586e02 (patch) | |
| tree | 91921f7c0884813c72993fcd2ecd37dc5e56d89d /include/net/route.h | |
| parent | 912d398d28b4359c2fb1f3763f1ce4f86de8350e (diff) | |
| parent | 1b86a58f9d7ce4fe2377687f378fbfb53bdc9b6c (diff) | |
| download | linux-c1e48efc701b79ee4367c9a1a4e8bbc7c3586e02.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/benet/be_main.c
Diffstat (limited to 'include/net/route.h')
| -rw-r--r-- | include/net/route.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/route.h b/include/net/route.h index b24288595e58..3782cddd1383 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -64,6 +64,7 @@ struct rtable { __be32 rt_dst; /* Path destination */ __be32 rt_src; /* Path source */ + int rt_route_iif; int rt_iif; int rt_oif; __u32 rt_mark; @@ -80,12 +81,12 @@ struct rtable { static inline bool rt_is_input_route(struct rtable *rt) { - return rt->rt_iif != 0; + return rt->rt_route_iif != 0; } static inline bool rt_is_output_route(struct rtable *rt) { - return rt->rt_iif == 0; + return rt->rt_route_iif == 0; } struct ip_rt_acct { |