X-Git-Url: https://bbs.cooldavid.org/git/?a=blobdiff_plain;f=net%2Fipv4%2Fnetfilter.c;h=e49441ac357161382ed248a763232260ec4f8b3f;hb=47dcf0cb1005e86d0eea780f2984b2e7490f63cd;hp=bfc8d753a23a59e90e1f33758f7ce8aa51a38a24;hpb=82e91ffef60e6eba9848fe149ce1eecd2b5aef12;p=net-next-2.6.git

diff --git a/net/ipv4/netfilter.c b/net/ipv4/netfilter.c
index bfc8d753a23..e49441ac357 100644
--- a/net/ipv4/netfilter.c
+++ b/net/ipv4/netfilter.c
@@ -27,9 +27,7 @@ int ip_route_me_harder(struct sk_buff **pskb, unsigned addr_type)
 		fl.nl_u.ip4_u.saddr = iph->saddr;
 		fl.nl_u.ip4_u.tos = RT_TOS(iph->tos);
 		fl.oif = (*pskb)->sk ? (*pskb)->sk->sk_bound_dev_if : 0;
-#ifdef CONFIG_IP_ROUTE_FWMARK
-		fl.nl_u.ip4_u.fwmark = (*pskb)->mark;
-#endif
+		fl.mark = (*pskb)->mark;
 		if (ip_route_output_key(&rt, &fl) != 0)
 			return -1;