diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-05-30 21:34:37 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-30 21:34:37 +0100 |
| commit | 4ff4258a3e558814a3d48c50a59cd22f56bbea2f (patch) | |
| tree | 35ac4a5d2b162687eef0c38aecf14f3a7c5afee0 /include/net/route.h | |
| parent | 442d207eb0b4e7047c4fedccd900c425e689d502 (diff) | |
| parent | 5e485b7975472ba4a408523deb6541e70c451842 (diff) | |
| download | kernel_samsung_smdk4412-4ff4258a3e558814a3d48c50a59cd22f56bbea2f.zip kernel_samsung_smdk4412-4ff4258a3e558814a3d48c50a59cd22f56bbea2f.tar.gz kernel_samsung_smdk4412-4ff4258a3e558814a3d48c50a59cd22f56bbea2f.tar.bz2 | |
Automatic merge with /usr/src/ntfs-2.6.git.
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 efe92b2..d34ca8f 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); |