Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-21 07:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcp: Use defaults when no route options are available

Browse Source 
Trying to parse the option of a SYN packet that we have
no route entry for should just use global wide defaults
for route entry options.

Signed-off-by: Gilad Ben-Yossef <gilad@codefidence.com>
Tested-by: Valdis.Kletnieks@vt.edu
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Gilad Ben-Yossef 2009-11-04 23:23:10 -08:00 committed by David S. Miller
parent 05eaade278
commit 6a2a2d6bf8
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/dst.h
View File

@ -113,7 +113,7 @@ dst_metric(const struct dst_entry *dst, int metric)
static inline u32
dst_feature(const struct dst_entry *dst, u32 feature)
{
return dst_metric(dst, RTAX_FEATURES) & feature;
return (dst ? dst_metric(dst, RTAX_FEATURES) & feature : 0);
}
static inline u32 dst_mtu(const struct dst_entry *dst)

2
net/ipv4/tcp_input.c
View File

@ -3704,8 +3704,6 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
struct tcphdr *th = tcp_hdr(skb);
int length = (th->doff * 4) - sizeof(struct tcphdr);
BUG_ON(!estab && !dst);
ptr = (unsigned char *)(th + 1);
opt_rx->saw_tstamp = 0;