tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds a3b5960e 37b0d1de

+3 -3
+1
net/dccp/ackvec.c
··· 452 452 (unsigned long long) 453 453 avr->dccpavr_ack_ackno); 454 454 dccp_ackvec_throw_record(av, avr); 455 + break; 455 456 } 456 457 /* 457 458 * If it wasn't received, continue scanning... we might
+1
net/ipv4/ip_forward.c
··· 116 116 117 117 too_many_hops: 118 118 /* Tell the sender its packet died... */ 119 + IP_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS); 119 120 icmp_send(skb, ICMP_TIME_EXCEEDED, ICMP_EXC_TTL, 0); 120 121 drop: 121 122 kfree_skb(skb);
+1 -3
net/ipv4/tcp_input.c
··· 1649 1649 * Hence, we can detect timed out packets during fast 1650 1650 * retransmit without falling to slow start. 1651 1651 */ 1652 - if (tcp_head_timedout(sk, tp)) { 1652 + if (!IsReno(tp) && tcp_head_timedout(sk, tp)) { 1653 1653 struct sk_buff *skb; 1654 1654 1655 1655 skb = tp->scoreboard_skb_hint ? tp->scoreboard_skb_hint ··· 1662 1662 if (!(TCP_SKB_CB(skb)->sacked&TCPCB_TAGBITS)) { 1663 1663 TCP_SKB_CB(skb)->sacked |= TCPCB_LOST; 1664 1664 tp->lost_out += tcp_skb_pcount(skb); 1665 - if (IsReno(tp)) 1666 - tcp_remove_reno_sacks(sk, tp, tcp_skb_pcount(skb) + 1); 1667 1665 1668 1666 /* clear xmit_retrans hint */ 1669 1667 if (tp->retransmit_skb_hint &&