Commit 1d19f176 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:
  [ATM] CLIP: Do not refer freed skbuff in clip_mkip().
  [NET]: Drop tx lock in dev_watchdog_up
  [PACKET]: Don't truncate non-linear skbs with mmaped IO
  [NET]: Mark frame diverter for future removal.
  [NETFILTER]: Add secmark headers to header-y
  [ATM]: linux-atm-general mailing list is subscribers only
  [ATM]: [he] when transmit fails, unmap the dma regions
  [TCP] tcp-lp: update information to MAINTAINERS
  [TCP] tcp-lp: bug fix for oops in 2.6.18-rc6
  [BRIDGE]: random extra bytes on STP TCN packet
  [IPV6]: Accept -1 for IPV6_TCLASS
  [IPV6]: Fix tclass setting for raw sockets.
  [IPVS]: remove the debug option go ip_vs_ftp
  [IPVS]: Make sure ip_vs_ftp ports are valid
  [IPVS]: auto-help for ip_vs_ftp
  [IPVS]: Document the ports option to ip_vs_ftp in kernel-parameters.txt
  [TCP]: Turn ABC off.
  [NEIGH]: neigh_table_clear() doesn't free stats
parents 20bf94e2 fe26109a

Documentation/feature-removal-schedule.txt

+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>

Documentation/kernel-parameters.txt

+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

Documentation/networking/ip-sysctl.txt

+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

MAINTAINERS

+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
@@ -2810,6 +2810,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

drivers/atm/he.c

+9 −0
Original line number Diff line number Diff line
@@ -2282,6 +2282,8 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid) 
				TPDRQ_MASK(he_readl(he_dev, TPDRQ_B_H)));



		if (new_tail == he_dev->tpdrq_head) {

			int slot;



			hprintk("tpdrq full (cid 0x%x)\n", cid);

			/*

			 * FIXME
@@ -2289,6 +2291,13 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid) 
			 * after service_tbrq, service the backlog

			 * for now, we just drop the pdu

			 */

			for (slot = 0; slot < TPD_MAXIOV; ++slot) {

				if (tpd->iovec[slot].addr)

					pci_unmap_single(he_dev->pci_dev,

						tpd->iovec[slot].addr,

						tpd->iovec[slot].len & TPD_LEN_MASK,

								PCI_DMA_TODEVICE);

			}

			if (tpd->skb) {

				if (tpd->vcc->pop)

					tpd->vcc->pop(tpd->vcc, tpd->skb);

CRA Git | Maintained and supported by SUSTech CRA and CCSE