diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-01 02:37:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-06-01 02:37:23 -0500 |
| commit | 9d5432979951c8761c2b4517007039b9bcc1c110 (patch) | |
| tree | 9441cb1cd4a7674a2292936bfb42514f33d24cd4 /include/net/route.h | |
| parent | a913829e90e2af7a6e98f5aadcc9fec4dcf1ef64 (diff) | |
| parent | 21e3024cbddb712f6a078bf4132d7682d3c4e35e (diff) | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/net/route.h')
| -rw-r--r-- | include/net/route.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/net/route.h b/include/net/route.h index efe92b239ef..d34ca8fc675 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -181,9 +181,6 @@ static inline int ip_route_newports(struct rtable **rp, u16 sport, u16 dport, memcpy(&fl, &(*rp)->fl, sizeof(fl)); fl.fl_ip_sport = sport; fl.fl_ip_dport = dport; -#if defined(CONFIG_IP_ROUTE_MULTIPATH_CACHED) - fl.flags |= FLOWI_FLAG_MULTIPATHOLDROUTE; -#endif ip_rt_put(*rp); *rp = NULL; return ip_route_output_flow(rp, &fl, sk, 0); |