Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3b5960e authored Jun 12, 2006 by Linus Torvalds

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

parents 37b0d1de 42d1d52e

net/dccp/ackvec.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -452,6 +452,7 @@ static void dccp_ackvec_check_rcv_ackvector(struct dccp_ackvec *av,
	(unsigned long long)		(unsigned long long)
	avr->dccpavr_ack_ackno);		avr->dccpavr_ack_ackno);
	dccp_ackvec_throw_record(av, avr);		dccp_ackvec_throw_record(av, avr);
			break;
	}		}
	/*		/*
	* If it wasn't received, continue scanning... we might		* If it wasn't received, continue scanning... we might

net/ipv4/ip_forward.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -116,6 +116,7 @@ int ip_forward(struct sk_buff *skb)

	too_many_hops:		too_many_hops:
	/* Tell the sender its packet died... */		/* Tell the sender its packet died... */
			IP_INC_STATS_BH(IPSTATS_MIB_INHDRERRORS);
	icmp_send(skb, ICMP_TIME_EXCEEDED, ICMP_EXC_TTL, 0);		icmp_send(skb, ICMP_TIME_EXCEEDED, ICMP_EXC_TTL, 0);
	drop:		drop:
	kfree_skb(skb);		kfree_skb(skb);

net/ipv4/tcp_input.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -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		* Hence, we can detect timed out packets during fast
	* retransmit without falling to slow start.		* retransmit without falling to slow start.
	*/		*/
	if (tcp_head_timedout(sk, tp)) {		if (!IsReno(tp) && tcp_head_timedout(sk, tp)) {
	struct sk_buff *skb;		struct sk_buff *skb;

	skb = tp->scoreboard_skb_hint ? tp->scoreboard_skb_hint		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)) {		if (!(TCP_SKB_CB(skb)->sacked&TCPCB_TAGBITS)) {
	TCP_SKB_CB(skb)->sacked \|= TCPCB_LOST;		TCP_SKB_CB(skb)->sacked \|= TCPCB_LOST;
	tp->lost_out += tcp_skb_pcount(skb);		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 */		/* clear xmit_retrans hint */
	if (tp->retransmit_skb_hint &&		if (tp->retransmit_skb_hint &&