diff options
| author | Thomas Graf <tgraf@suug.ch> | 2006-11-10 00:20:38 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 06:21:39 +0100 |
| commit | 47dcf0cb1005e86d0eea780f2984b2e7490f63cd (patch) | |
| tree | 1a56767a77e219fab54ab1daf34342745f6d62a8 /include/net/ip_mp_alg.h | |
| parent | [NET]: Turn nfmark into generic mark (diff) | |
| download | linux-47dcf0cb1005e86d0eea780f2984b2e7490f63cd.tar.xz linux-47dcf0cb1005e86d0eea780f2984b2e7490f63cd.zip | |
[NET]: Rethink mark field in struct flowi
Now that all protocols have been made aware of the mark
field it can be moved out of the union thus simplyfing
its usage.
The config options in the IPv4/IPv6/DECnet subsystems
to enable respectively disable mark based routing only
obfuscate the code with ifdefs, the cost for the
additional comparison in the flow key is insignificant,
and most distributions have all these options enabled
by default anyway. Therefore it makes sense to remove
the config options and enable mark based routing by
default.
Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/ip_mp_alg.h')
| -rw-r--r-- | include/net/ip_mp_alg.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/net/ip_mp_alg.h b/include/net/ip_mp_alg.h index beffdd66ad74..25b56571e54b 100644 --- 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)); } |