Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [IPV4]: Increment ipInHdrErrors when TTL expires. [TCP]: continued: reno sacked_out count fix [DCCP] Ackvec: fix soft lockup in ackvec handling code
This commit is contained in:
commit
a3b5960ebd
|
@ -452,6 +452,7 @@ found:
|
|||
(unsigned long long)
|
||||
avr->dccpavr_ack_ackno);
|
||||
dccp_ackvec_throw_record(av, avr);
|
||||
break;
|
||||
}
|
||||
/*
|
||||
* If it wasn't received, continue scanning... we might
|
||||
|
|
|
@ -116,6 +116,7 @@ sr_failed:
|
|||
|
||||
too_many_hops:
|
||||
/* Tell the sender its packet died... */
|
||||
IP_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS);
|
||||
icmp_send(skb, ICMP_TIME_EXCEEDED, ICMP_EXC_TTL, 0);
|
||||
drop:
|
||||
kfree_skb(skb);
|
||||
|
|
|
@ -1649,7 +1649,7 @@ static void tcp_update_scoreboard(struct sock *sk, struct tcp_sock *tp)
|
|||
* Hence, we can detect timed out packets during fast
|
||||
* retransmit without falling to slow start.
|
||||
*/
|
||||
if (tcp_head_timedout(sk, tp)) {
|
||||
if (!IsReno(tp) && tcp_head_timedout(sk, tp)) {
|
||||
struct sk_buff *skb;
|
||||
|
||||
skb = tp->scoreboard_skb_hint ? tp->scoreboard_skb_hint
|
||||
|
@ -1662,8 +1662,6 @@ static void tcp_update_scoreboard(struct sock *sk, struct tcp_sock *tp)
|
|||
if (!(TCP_SKB_CB(skb)->sacked&TCPCB_TAGBITS)) {
|
||||
TCP_SKB_CB(skb)->sacked |= TCPCB_LOST;
|
||||
tp->lost_out += tcp_skb_pcount(skb);
|
||||
if (IsReno(tp))
|
||||
tcp_remove_reno_sacks(sk, tp, tcp_skb_pcount(skb) + 1);
|
||||
|
||||
/* clear xmit_retrans hint */
|
||||
if (tp->retransmit_skb_hint &&
|
||||
|
|
Loading…
Reference in a new issue