Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[mv-sheeva.git] / include / net / ip_mp_alg.h

diff --git a/include/net/ip_mp_alg.h b/include/net/ip_mp_alg.h
index beffdd66ad74f81ac2c5a9d40003ff4ad372102f..25b56571e54bf5b4713ff2780abbdae3cc441cdb 100644 (file)
--- a/include/net/ip_mp_alg.h
+++ b/include/net/ip_mp_alg.h
@@ -88,9 +88,7 @@ static inline int multipath_comparekeys(const struct flowi *flp1,
        return flp1->fl4_dst == flp2->fl4_dst &&
                flp1->fl4_src == flp2->fl4_src &&
                flp1->oif == flp2->oif &&
-#ifdef CONFIG_IP_ROUTE_FWMARK
-               flp1->fl4_fwmark == flp2->fl4_fwmark &&
-#endif
+               flp1->mark == flp2->mark &&
                !((flp1->fl4_tos ^ flp2->fl4_tos) &
                  (IPTOS_RT_MASK | RTO_ONLINK));
 }