From a764993d4da29e0378fc7cd6127e152f2669147e Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Thu, 9 Nov 2006 15:21:41 -0800 Subject: [PATCH] --- yaml --- r: 41601 b: refs/heads/master c: 5f300893fdd3b6e30a226c9a848eaa39b99a6431 h: refs/heads/master i: 41599: 6da8a00289c686a3c0537681047a5383c325928a v: v3 --- [refs] | 2 +- trunk/include/net/ip_fib.h | 2 +- trunk/net/ipv4/fib_frontend.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 63c5c1280608..63a04589053a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47dcf0cb1005e86d0eea780f2984b2e7490f63cd +refs/heads/master: 5f300893fdd3b6e30a226c9a848eaa39b99a6431 diff --git a/trunk/include/net/ip_fib.h b/trunk/include/net/ip_fib.h index 949b932d2f08..36c635ca1aa6 100644 --- a/trunk/include/net/ip_fib.h +++ b/trunk/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/trunk/net/ipv4/fib_frontend.c b/trunk/net/ipv4/fib_frontend.c index ee8daaebcfaf..14025345cc56 100644 --- a/trunk/net/ipv4/fib_frontend.c +++ b/trunk/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 } } };