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

Commit fb7d4045 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]: Fix minisock tcp_create_openreq_child() typo.
  [TCP]: Document several sysctls.
  [NET]: Fix kfree(skb)
  [NET]: Handle disabled preemption in gfp_any()
  [BRIDGE]: Fix locking of set path cost.
  [IPV6]: /proc/net/anycast6 unbalanced inet6_dev refcnt
  [IPX]: Remove ancient changelog
  [IPX]: Remove outdated information from Kconfig
  [NET]: Revert socket.h/stat.h ifdef hacks.
  [IPV6]: anycast refcnt fix
  [XFRM] xfrm_user: Fix return values of xfrm_add_sa_expire.
parents 100b4254 a9948a7e

Documentation/networking/ip-sysctl.txt

+26 −0
Original line number Diff line number Diff line
@@ -147,6 +147,11 @@ tcp_available_congestion_control - STRING 
	More congestion control algorithms may be available as modules,

	but not loaded.



tcp_base_mss - INTEGER

	The initial value of search_low to be used by Packetization Layer

	Path MTU Discovery (MTU probing).  If MTU probing is enabled,

	this is the inital MSS used by the connection.



tcp_congestion_control - STRING

	Set the congestion control algorithm to be used for new

	connections. The algorithm "reno" is always available, but
@@ -243,6 +248,27 @@ tcp_mem - vector of 3 INTEGERs: min, pressure, max 
	Defaults are calculated at boot time from amount of available

	memory.



tcp_moderate_rcvbuf - BOOLEAN

	If set, TCP performs receive buffer autotuning, attempting to

	automatically size the buffer (no greater than tcp_rmem[2]) to

	match the size required by the path for full throughput.  Enabled by

	default.



tcp_mtu_probing - INTEGER

	Controls TCP Packetization-Layer Path MTU Discovery.  Takes three

	values:

	  0 - Disabled

	  1 - Disabled by default, enabled when an ICMP black hole detected

	  2 - Always enabled, use initial MSS of tcp_base_mss.



tcp_no_metrics_save - BOOLEAN

	By default, TCP saves various connection metrics in the route cache

	when the connection closes, so that connections established in the

	near future can use these to set initial conditions.  Usually, this

	increases overall performance, but may sometimes cause performance

	degredation.  If set, TCP will not cache metrics on closing

	connections.



tcp_orphan_retries - INTEGER

	How may times to retry before killing TCP connection, closed

	by our side. Default value 7 corresponds to ~50sec-16min

include/linux/socket.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct __kernel_sockaddr_storage { 
				/* _SS_MAXSIZE value minus size of ss_family */

} __attribute__ ((aligned(_K_SS_ALIGNSIZE)));	/* force desired alignment */



#ifdef __KERNEL__

#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)



#include <asm/socket.h>			/* arch-dependent defines	*/

#include <linux/sockios.h>		/* the SIOCxxx I/O controls	*/

include/linux/stat.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


#endif



#ifdef __KERNEL__

#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)



#define S_IFMT  00170000

#define S_IFSOCK 0140000

include/net/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -1278,7 +1278,7 @@ static inline int sock_writeable(const struct sock *sk) 


static inline gfp_t gfp_any(void)

{

	return in_softirq() ? GFP_ATOMIC : GFP_KERNEL;

	return in_atomic() ? GFP_ATOMIC : GFP_KERNEL;

}



static inline long sock_rcvtimeo(const struct sock *sk, int noblock)

net/bridge/br_ioctl.c

+1 −2
Original line number Diff line number Diff line
@@ -291,12 +291,11 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
		if (!capable(CAP_NET_ADMIN))

			return -EPERM;



		spin_lock_bh(&br->lock);

		if ((p = br_get_port(br, args[1])) == NULL)

			ret = -EINVAL;

		else

			br_stp_set_path_cost(p, args[2]);

		spin_unlock_bh(&br->lock);



		return ret;

	}