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

Commit 23b6b0e3 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream

parents 8624a1c9 47a5c6fa
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -281,3 +281,16 @@ Why: The deferred output hooks are a layering violation causing unusual
Who:	Patrick McHardy <kaber@trash.net>

---------------------------

What:	frame diverter
When:	November 2006
Why:	The frame diverter is included in most distribution kernels, but is
	broken. It does not correctly handle many things:
	- IPV6
	- non-linear skb's
	- network device RCU on removal
	- input frames not correctly checked for protocol errors
	It also adds allocation overhead even if not enabled.
	It is not clear if anyone is still using it.
Who:	Stephen Hemminger <shemminger@osdl.org>
+6 −0
Original line number Diff line number Diff line
@@ -697,6 +697,12 @@ running once the system is up.
	ips=		[HW,SCSI] Adaptec / IBM ServeRAID controller
			See header of drivers/scsi/ips.c.

	ports=		[IP_VS_FTP] IPVS ftp helper module
			Default is 21.
			Up to 8 (IP_VS_APP_MAX_PORTS) ports
			may be specified.
			Format: <port>,<port>....

	irqfixup	[HW]
			When an interrupt is not handled search all handlers
			for it. Intended to get systems with badly broken
+9 −3
Original line number Diff line number Diff line
@@ -102,9 +102,15 @@ inet_peer_gc_maxtime - INTEGER
TCP variables: 

tcp_abc - INTEGER
	Controls Appropriate Byte Count defined in RFC3465. If set to
	0 then does congestion avoid once per ack. 1 is conservative
	value, and 2 is more agressive.
	Controls Appropriate Byte Count (ABC) defined in RFC3465.
	ABC is a way of increasing congestion window (cwnd) more slowly
	in response to partial acknowledgments.
	Possible values are:
		0 increase cwnd once per acknowledgment (no ABC)
		1 increase cwnd once per acknowledgment of full sized segment
		2 allow increase cwnd by two if acknowledgment is
		  of two segments to compensate for delayed acknowledgments.
	Default: 0 (off)

tcp_syn_retries - INTEGER
	Number of times initial SYNs for an active TCP connection attempt
+9 −1
Original line number Diff line number Diff line
@@ -416,7 +416,7 @@ S: Supported
ATM
P:	Chas Williams
M:	chas@cmf.nrl.navy.mil
L:	linux-atm-general@lists.sourceforge.net
L:	linux-atm-general@lists.sourceforge.net (subscribers-only)
W:	http://linux-atm.sourceforge.net
S:	Maintained

@@ -2828,6 +2828,14 @@ M: hadi@cyberus.ca
L:	netdev@vger.kernel.org
S:	Maintained

TCP LOW PRIORITY MODULE
P:	Wong Hoi Sing, Edison
M:	hswong3i@gmail.com
P:	Hung Hing Lun, Mike
M:	hlhung3i@gmail.com
W:	http://tcp-lp-mod.sourceforge.net/
S:	Maintained

TI OMAP RANDOM NUMBER GENERATOR SUPPORT
P:	Deepak Saxena
M:	dsaxena@plexity.net
+154 −561

File changed.

Preview size limit exceeded, changes collapsed.

Loading