Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

[cascardo/linux.git] / include / net / ip_fib.h

diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
index 949b932..36c635c 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;