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

Commit cb46c370 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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:
  [TCP]: reno sacked_out count fix
  [IPV6]: Endian fix in net/ipv6/netfilter/ip6t_eui64.c:match().
  [TR]: Remove an unused export.
  [IPX]: Correct return type of ipx_map_frame_type().
  [IPX]: Correct argument type of ipxrtr_delete().
  [PKT_SCHED]: Potential jiffy wrap bug in dev_watchdog().
parents 96764898 8872d8e1

net/802/tr.c

+0 −1
Original line number Diff line number Diff line
@@ -643,6 +643,5 @@ static int __init rif_init(void) 


module_init(rif_init);



EXPORT_SYMBOL(tr_source_route);

EXPORT_SYMBOL(tr_type_trans);

EXPORT_SYMBOL(alloc_trdev);

net/ipv4/tcp_input.c

+2 −0
Original line number Diff line number Diff line
@@ -1662,6 +1662,8 @@ 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 &&

net/ipv6/netfilter/ip6t_eui64.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ match(const struct sk_buff *skb, 


	memset(eui64, 0, sizeof(eui64));



	if (eth_hdr(skb)->h_proto == ntohs(ETH_P_IPV6)) {

	if (eth_hdr(skb)->h_proto == htons(ETH_P_IPV6)) {

		if (skb->nh.ipv6h->version == 0x6) {

			memcpy(eui64, eth_hdr(skb)->h_source, 3);

			memcpy(eui64 + 5, eth_hdr(skb)->h_source + 3, 3);

net/ipx/af_ipx.c

+2 −2
Original line number Diff line number Diff line
@@ -944,9 +944,9 @@ static int ipxitf_create_internal(struct ipx_interface_definition *idef) 
	return rc;

}



static int ipx_map_frame_type(unsigned char type)

static __be16 ipx_map_frame_type(unsigned char type)

{

	int rc = 0;

	__be16 rc = 0;



	switch (type) {

	case IPX_FRAME_ETHERII:	rc = htons(ETH_P_IPX);		break;

net/ipx/ipx_route.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static int ipxrtr_create(struct ipx_route_definition *rd) 
	return rc;

}



static int ipxrtr_delete(long net)

static int ipxrtr_delete(__u32 net)

{

	struct ipx_route *r, *tmp;

	int rc;