Commit fdccffc6 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:
  [NET]: drop duplicate assignment in request_sock
  [IPSEC]: Fix tunnel error handling in ipcomp6
parents 4fa63912 3eb4801d

include/net/request_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static inline struct request_sock * 
{

	struct request_sock *req = queue->rskq_accept_head;



	queue->rskq_accept_head = queue->rskq_accept_head = NULL;

	queue->rskq_accept_head = NULL;

	return req;

}

net/core/request_sock.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ int reqsk_queue_alloc(struct request_sock_queue *queue, 


	get_random_bytes(&lopt->hash_rnd, sizeof(lopt->hash_rnd));

	rwlock_init(&queue->syn_wait_lock);

	queue->rskq_accept_head = queue->rskq_accept_head = NULL;

	queue->rskq_accept_head = NULL;

	lopt->nr_table_entries = nr_table_entries;



	write_lock_bh(&queue->syn_wait_lock);

net/ipv6/ipcomp6.c

+5 −0
Original line number Diff line number Diff line
@@ -228,6 +228,9 @@ static struct xfrm_state *ipcomp6_tunnel_create(struct xfrm_state *x) 


	t->id.proto = IPPROTO_IPV6;

	t->id.spi = xfrm6_tunnel_alloc_spi((xfrm_address_t *)&x->props.saddr);

	if (!t->id.spi)

		goto error;



	memcpy(t->id.daddr.a6, x->id.daddr.a6, sizeof(struct in6_addr));

	memcpy(&t->sel, &x->sel, sizeof(t->sel));

	t->props.family = AF_INET6;
@@ -243,7 +246,9 @@ static struct xfrm_state *ipcomp6_tunnel_create(struct xfrm_state *x) 
	return t;



error:

	t->km.state = XFRM_STATE_DEAD;

	xfrm_state_put(t);

	t = NULL;

	goto out;

}