diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-01-31 17:35:35 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-01-31 17:35:35 -0800 |
| commit | 5d39a795bfa217b5f7637028c83ab5cb291f37bf (patch) | |
| tree | 025bee4ea9c90b5fac7a7c939664a89120303170 /include | |
| parent | 7fb76aa07facce5cb9c8d26a0de09001a31eed0c (diff) | |
| download | linux-5d39a795bfa217b5f7637028c83ab5cb291f37bf.tar.gz linux-5d39a795bfa217b5f7637028c83ab5cb291f37bf.tar.bz2 linux-5d39a795bfa217b5f7637028c83ab5cb291f37bf.zip | |
[IPV4]: Always set fl.proto in ip_route_newports
ip_route_newports uses the struct flowi from the struct rtable returned
by ip_route_connect for the new route lookup and just replaces the port
numbers if they have changed. If an IPsec policy exists which doesn't match
port 0 the struct flowi won't have the proto field set and no xfrm lookup
is done for the changed ports.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/route.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/route.h b/include/net/route.h index e3e5436f8017..9c04f15090d2 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -170,8 +170,8 @@ static inline int ip_route_connect(struct rtable **rp, u32 dst, return ip_route_output_flow(rp, &fl, sk, 0); } -static inline int ip_route_newports(struct rtable **rp, u16 sport, u16 dport, - struct sock *sk) +static inline int ip_route_newports(struct rtable **rp, u8 protocol, + u16 sport, u16 dport, struct sock *sk) { if (sport != (*rp)->fl.fl_ip_sport || dport != (*rp)->fl.fl_ip_dport) { @@ -180,6 +180,7 @@ 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; + fl.proto = protocol; ip_rt_put(*rp); *rp = NULL; return ip_route_output_flow(rp, &fl, sk, 0); |