diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 22:24:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 22:24:43 -0500 |
| commit | e1762ec6d72b71c4476018af3c153cd362a5e94e (patch) | |
| tree | 6814cb9ee9dee93e5734be92cd1d6775c335ba48 /include | |
| parent | ef59c4e935feb966900a8321e75f74d7df2a2f16 (diff) | |
| parent | 0cbd782507c502428c8ab3e91bee3940c19ac4d4 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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, | |||
| 170 | return ip_route_output_flow(rp, &fl, sk, 0); | 170 | return ip_route_output_flow(rp, &fl, sk, 0); |
| 171 | } | 171 | } |
| 172 | 172 | ||
| 173 | static inline int ip_route_newports(struct rtable **rp, u16 sport, u16 dport, | 173 | static inline int ip_route_newports(struct rtable **rp, u8 protocol, |
| 174 | struct sock *sk) | 174 | u16 sport, u16 dport, struct sock *sk) |
| 175 | { | 175 | { |
| 176 | if (sport != (*rp)->fl.fl_ip_sport || | 176 | if (sport != (*rp)->fl.fl_ip_sport || |
| 177 | dport != (*rp)->fl.fl_ip_dport) { | 177 | dport != (*rp)->fl.fl_ip_dport) { |
| @@ -180,6 +180,7 @@ static inline int ip_route_newports(struct rtable **rp, u16 sport, u16 dport, | |||
| 180 | memcpy(&fl, &(*rp)->fl, sizeof(fl)); | 180 | memcpy(&fl, &(*rp)->fl, sizeof(fl)); |
| 181 | fl.fl_ip_sport = sport; | 181 | fl.fl_ip_sport = sport; |
| 182 | fl.fl_ip_dport = dport; | 182 | fl.fl_ip_dport = dport; |
| 183 | fl.proto = protocol; | ||
| 183 | ip_rt_put(*rp); | 184 | ip_rt_put(*rp); |
| 184 | *rp = NULL; | 185 | *rp = NULL; |
| 185 | return ip_route_output_flow(rp, &fl, sk, 0); | 186 | return ip_route_output_flow(rp, &fl, sk, 0); |