diff options
author | Thomas Graf <tgraf@suug.ch> | 2006-11-09 18:21:41 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:21:40 -0500 |
commit | 5f300893fdd3b6e30a226c9a848eaa39b99a6431 (patch) | |
tree | b4faa185f1fd9e8aee1b3e4280278e54ede5eeb1 | |
parent | 47dcf0cb1005e86d0eea780f2984b2e7490f63cd (diff) |
[IPV4] nl_fib_lookup: Rename fl_fwmark to fl_mark
For the sake of consistency.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/ip_fib.h | 2 | ||||
-rw-r--r-- | net/ipv4/fib_frontend.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h index 949b932d2f08..36c635ca1aa6 100644 --- a/include/net/ip_fib.h +++ b/include/net/ip_fib.h | |||
@@ -115,7 +115,7 @@ struct fib_result { | |||
115 | 115 | ||
116 | struct fib_result_nl { | 116 | struct fib_result_nl { |
117 | __be32 fl_addr; /* To be looked up*/ | 117 | __be32 fl_addr; /* To be looked up*/ |
118 | u32 fl_fwmark; | 118 | u32 fl_mark; |
119 | unsigned char fl_tos; | 119 | unsigned char fl_tos; |
120 | unsigned char fl_scope; | 120 | unsigned char fl_scope; |
121 | unsigned char tb_id_in; | 121 | unsigned char tb_id_in; |
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index ee8daaebcfaf..14025345cc56 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c | |||
@@ -768,7 +768,7 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb ) | |||
768 | { | 768 | { |
769 | 769 | ||
770 | struct fib_result res; | 770 | struct fib_result res; |
771 | struct flowi fl = { .mark = frn->fl_fwmark, | 771 | struct flowi fl = { .mark = frn->fl_mark, |
772 | .nl_u = { .ip4_u = { .daddr = frn->fl_addr, | 772 | .nl_u = { .ip4_u = { .daddr = frn->fl_addr, |
773 | .tos = frn->fl_tos, | 773 | .tos = frn->fl_tos, |
774 | .scope = frn->fl_scope } } }; | 774 | .scope = frn->fl_scope } } }; |