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

Commit eb193e40 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:
  [NETFILTER]: silence a warning in ebtables
  [IPV6]: File the fingerprints off ah6->spi/esp6->spi
  [TCP]: Set default congestion control when no sysctl.
  [TIPC] net/tipc/port.c: fix NULL dereference
parents 0ca2b776 6f5b7ef6

net/bridge/netfilter/ebtables.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static inline int ebt_do_match (struct ebt_entry_match *m, 
static inline int ebt_dev_check(char *entry, const struct net_device *device)

{

	int i = 0;

	char *devname = device->name;

	const char *devname = device->name;



	if (*entry == '\0')

		return 0;

net/ipv4/sysctl_net_ipv4.c

+0 −7
Original line number Diff line number Diff line
@@ -129,13 +129,6 @@ static int sysctl_tcp_congestion_control(ctl_table *table, int __user *name, 
	return ret;

}



static int __init tcp_congestion_default(void)

{

	return tcp_set_default_congestion_control(CONFIG_DEFAULT_TCP_CONG);

}



late_initcall(tcp_congestion_default);



ctl_table ipv4_table[] = {

        {

		.ctl_name	= NET_IPV4_TCP_TIMESTAMPS,

net/ipv4/tcp_cong.c

+8 −0
Original line number Diff line number Diff line
@@ -131,6 +131,14 @@ int tcp_set_default_congestion_control(const char *name) 
	return ret;

}



/* Set default value from kernel configuration at bootup */

static int __init tcp_congestion_default(void)

{

	return tcp_set_default_congestion_control(CONFIG_DEFAULT_TCP_CONG);

}

late_initcall(tcp_congestion_default);





/* Get current default congestion control */

void tcp_get_default_congestion_control(char *name)

{

net/ipv6/xfrm6_tunnel.c

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ u32 xfrm6_tunnel_spi_lookup(xfrm_address_t *saddr) 
	x6spi = __xfrm6_tunnel_spi_lookup(saddr);

	spi = x6spi ? x6spi->spi : 0;

	read_unlock_bh(&xfrm6_tunnel_spi_lock);

	return spi;

	return htonl(spi);

}



EXPORT_SYMBOL(xfrm6_tunnel_spi_lookup);
@@ -210,7 +210,7 @@ u32 xfrm6_tunnel_alloc_spi(xfrm_address_t *saddr) 
		spi = __xfrm6_tunnel_alloc_spi(saddr);

	write_unlock_bh(&xfrm6_tunnel_spi_lock);



	return spi;

	return htonl(spi);

}



EXPORT_SYMBOL(xfrm6_tunnel_alloc_spi);

net/tipc/port.c

+3 −2
Original line number Diff line number Diff line
@@ -1136,11 +1136,12 @@ int tipc_publish(u32 ref, unsigned int scope, struct tipc_name_seq const *seq) 
	int res = -EINVAL;



	p_ptr = tipc_port_lock(ref);

	if (!p_ptr)

		return -EINVAL;



	dbg("tipc_publ %u, p_ptr = %x, conn = %x, scope = %x, "

	    "lower = %u, upper = %u\n",

	    ref, p_ptr, p_ptr->publ.connected, scope, seq->lower, seq->upper);

	if (!p_ptr)

		return -EINVAL;

	if (p_ptr->publ.connected)

		goto exit;

	if (seq->lower > seq->upper)