[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>

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 949b932d2f08c8f72017f8d61ce1f773192f55e0..36c635ca1aa61e73c83835769799a83c1bf74d6d 100644 (file)
--- a/include/net/ip_fib.h
+++ b/include/net/ip_fib.h
@@ -115,7 +115,7 @@ struct fib_result {
 
 struct fib_result_nl {
        __be32          fl_addr;   /* To be looked up*/
-       u32             fl_fwmark; 
+       u32             fl_mark;
        unsigned char   fl_tos;
        unsigned char   fl_scope;
        unsigned char   tb_id_in;

diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
index ee8daaebcfaf3c4bfb5d71a65b828df141f93025..14025345cc56e7f791824da451a00e6f53091994 100644 (file)
--- 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 )
 {
        
        struct fib_result       res;
-       struct flowi            fl = { .mark = frn->fl_fwmark,
+       struct flowi            fl = { .mark = frn->fl_mark,
                                       .nl_u = { .ip4_u = { .daddr = frn->fl_addr,
                                                            .tos = frn->fl_tos,
                                                            .scope = frn->fl_scope } } };