diff options
Diffstat (limited to 'net/ipv4/tcp_input.c')
-rw-r--r-- | net/ipv4/tcp_input.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index d1604f59d77e..2fbfc2e4209c 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c | |||
@@ -2708,7 +2708,7 @@ static int tcp_process_frto(struct sock *sk, u32 prior_snd_una, int flag) | |||
2708 | default: | 2708 | default: |
2709 | tcp_ratehalving_spur_to_response(sk); | 2709 | tcp_ratehalving_spur_to_response(sk); |
2710 | break; | 2710 | break; |
2711 | }; | 2711 | } |
2712 | tp->frto_counter = 0; | 2712 | tp->frto_counter = 0; |
2713 | } | 2713 | } |
2714 | return 0; | 2714 | return 0; |
@@ -2915,10 +2915,11 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx, | |||
2915 | */ | 2915 | */ |
2916 | break; | 2916 | break; |
2917 | #endif | 2917 | #endif |
2918 | }; | 2918 | } |
2919 | |||
2919 | ptr+=opsize-2; | 2920 | ptr+=opsize-2; |
2920 | length-=opsize; | 2921 | length-=opsize; |
2921 | }; | 2922 | } |
2922 | } | 2923 | } |
2923 | } | 2924 | } |
2924 | 2925 | ||
@@ -3124,7 +3125,7 @@ static void tcp_fin(struct sk_buff *skb, struct sock *sk, struct tcphdr *th) | |||
3124 | printk(KERN_ERR "%s: Impossible, sk->sk_state=%d\n", | 3125 | printk(KERN_ERR "%s: Impossible, sk->sk_state=%d\n", |
3125 | __FUNCTION__, sk->sk_state); | 3126 | __FUNCTION__, sk->sk_state); |
3126 | break; | 3127 | break; |
3127 | }; | 3128 | } |
3128 | 3129 | ||
3129 | /* It _is_ possible, that we have something out-of-order _after_ FIN. | 3130 | /* It _is_ possible, that we have something out-of-order _after_ FIN. |
3130 | * Probably, we should reset in this case. For now drop them. | 3131 | * Probably, we should reset in this case. For now drop them. |