Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

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

What:	SCTP_GET_PEER_ADDRS_NUM_OLD, SCTP_GET_PEER_ADDRS_OLD,

	SCTP_GET_LOCAL_ADDRS_NUM_OLD, SCTP_GET_LOCAL_ADDRS_OLD

When: 	June 2009

Why:    A newer version of the options have been introduced in 2005 that

	removes the limitions of the old API.  The sctp library has been

        converted to use these new options at the same time.  Any user

	space app that directly uses the old options should convert to using

	the new options.

Who:	Vlad Yasevich <vladislav.yasevich@hp.com>

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

What:	Ability for non root users to shm_get hugetlb pages based on mlock

	resource limits

When:	2.6.31

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

1.1. Hardware

     --------

     This release supports the connection of the Gigaset 307x/417x family of

     This driver supports the connection of the Gigaset 307x/417x family of

     ISDN DECT bases via Gigaset M101 Data, Gigaset M105 Data or direct USB

     connection. The following devices are reported to be compatible:

              http://gigaset307x.sourceforge.net/

     We had also reports from users of Gigaset M105 who could use the drivers

     with SX 100 and CX 100 ISDN bases (only in unimodem mode, see section 2.4.)

     with SX 100 and CX 100 ISDN bases (only in unimodem mode, see section 2.5.)

     If you have another device that works with our driver, please let us know.

     Chances of getting an USB device to work are good if the output of

     --------

     The driver works with ISDN4linux and so can be used with any software

     which is able to use ISDN4linux for ISDN connections (voice or data).

     CAPI4Linux support is planned but not yet available.

     Experimental Kernel CAPI support is available as a compilation option.

     There are some user space tools available at

     http://sourceforge.net/projects/gigaset307x/

2.3. ISDN4linux

     ----------

     This is the "normal" mode of operation. After loading the module you can

     set up the ISDN system just as you'd do with any ISDN card.

     Your distribution should provide some configuration utility.

     If not, you can use some HOWTOs like

     set up the ISDN system just as you'd do with any ISDN card supported by

     the ISDN4Linux subsystem. Most distributions provide some configuration

     utility. If not, you can use some HOWTOs like

         http://www.linuxhaven.de/dlhp/HOWTO/DE-ISDN-HOWTO-5.html

     If this doesn't work, because you have some recent device like SX100 where

     If this doesn't work, because you have some device like SX100 where

     debug output (see section 3.2.) shows something like this when dialing

         CMD Received: ERROR

         Available Params: 0

         Connection State: 0, Response: -1

         gigaset_process_response: resp_code -1 in ConState 0 !

         Timeout occurred

     you might need to use unimodem mode:

     you might need to use unimodem mode. (see section 2.5.)

2.4. Unimodem mode

2.4. CAPI

     ----

     If the driver is compiled with CAPI support (kernel configuration option

     GIGASET_CAPI, experimental) it can also be used with CAPI 2.0 kernel and

     user space applications.  ISDN4Linux is supported in this configuration

     via the capidrv compatibility driver. The kernel module capidrv.ko must

     be loaded explicitly ("modprobe capidrv") if needed.

2.5. Unimodem mode

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

     This is needed for some devices [e.g. SX100] as they have problems with

     the "normal" commands.

     configuration file like /etc/modprobe.conf.local,

     using that should be preferred.

2.5. Call-ID (CID) mode

2.6. Call-ID (CID) mode

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

     Call-IDs are numbers used to tag commands to, and responses from, the

     Gigaset base in order to support the simultaneous handling of multiple

     You can also use /sys/class/tty/ttyGxy/cidmode for changing the CID mode

     setting (ttyGxy is ttyGU0 or ttyGB0).

2.6. Unregistered Wireless Devices (M101/M105)

2.7. Unregistered Wireless Devices (M101/M105)

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

     The main purpose of the ser_gigaset and usb_gigaset drivers is to allow

     the M101 and M105 wireless devices to be used as ISDN devices for ISDN

        You have two or more DECT data adapters (M101/M105) and only the

        first one you turn on works.

     Solution:

        Select Unimodem mode for all DECT data adapters. (see section 2.4.)

        Select Unimodem mode for all DECT data adapters. (see section 2.5.)

     Problem:

	Messages like this:

	appear in your syslog.

     Solution:

	Check whether your M10x wireless device is correctly registered to the

	Gigaset base. (see section 2.6.)

	Gigaset base. (see section 2.7.)

3.2. Telling the driver to provide more information

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

	uart6850=	[HW,OSS]

			Format: <io>,<irq>

	uhash_entries=	[KNL,NET]

			Set number of hash buckets for UDP/UDP-Lite connections

	uhci-hcd.ignore_oc=

			[USB] Ignore overcurrent events (default N).

			Some badly-designed motherboards generate lots of

		Linux Ethernet Bonding Driver HOWTO

		Latest update: 12 November 2007

		Latest update: 23 September 2009

Initial release : Thomas Davis <tadavis at lbl.gov>

Corrections, HA extensions : 2000/10/03-15 :

	The primary option is only valid for active-backup mode.

primary_reselect

	Specifies the reselection policy for the primary slave.  This

	affects how the primary slave is chosen to become the active slave

	when failure of the active slave or recovery of the primary slave

	occurs.  This option is designed to prevent flip-flopping between

	the primary slave and other slaves.  Possible values are:

	always or 0 (default)

		The primary slave becomes the active slave whenever it

		comes back up.

	better or 1

		The primary slave becomes the active slave when it comes

		back up, if the speed and duplex of the primary slave is

		better than the speed and duplex of the current active

		slave.

	failure or 2

		The primary slave becomes the active slave only if the

		current active slave fails and the primary slave is up.

	The primary_reselect setting is ignored in two cases:

		If no slaves are active, the first slave to recover is

		made the active slave.

		When initially enslaved, the primary slave is always made

		the active slave.

	Changing the primary_reselect policy via sysfs will cause an

	immediate selection of the best active slave according to the new

	policy.  This may or may not result in a change of the active

	slave, depending upon the circumstances.

	This option was added for bonding version 3.6.0.

updelay

	Specifies the time, in milliseconds, to wait before enabling a

	additional choices may be available based on kernel configuration.

	Default is set as part of kernel configuration.

tcp_cookie_size - INTEGER

	Default size of TCP Cookie Transactions (TCPCT) option, that may be

	overridden on a per socket basis by the TCPCT socket option.

	Values greater than the maximum (16) are interpreted as the maximum.

	Values greater than zero and less than the minimum (8) are interpreted

	as the minimum.  Odd values are interpreted as the next even value.

	Default: 0 (off).

tcp_dsack - BOOLEAN

	Allows TCP to send "duplicate" SACKs.

	default TRUE (router)

		FALSE (host)

accept_local - BOOLEAN

	Accept packets with local source addresses. In combination with

	suitable routing, this can be used to direct packets between two

	local interfaces over the wire and have them accepted properly.

	default FALSE

rp_filter - INTEGER

	0 - No source validation.

	1 - Strict mode as defined in RFC3704 Strict Reverse Path

	to prevent IP spoofing from DDos attacks. If using asymmetric routing

	or other complicated routing, then loose mode is recommended.

	conf/all/rp_filter must also be set to non-zero to do source validation

	on the interface

	The max value from conf/{all,interface}/rp_filter is used

	when doing source validation on the {interface}.

	Default value is 0. Note that some distributions enable it

	in startup scripts.

	2: Enable DAD, and disable IPv6 operation if MAC-based duplicate

	   link-local address has been found.

force_tllao - BOOLEAN

	Enable sending the target link-layer address option even when

	responding to a unicast neighbor solicitation.

	Default: FALSE

	Quoting from RFC 2461, section 4.4, Target link-layer address:

	"The option MUST be included for multicast solicitations in order to

	avoid infinite Neighbor Solicitation "recursion" when the peer node

	does not have a cache entry to return a Neighbor Advertisements

	message.  When responding to unicast solicitations, the option can be

	omitted since the sender of the solicitation has the correct link-

	layer address; otherwise it would not have be able to send the unicast

	solicitation in the first place. However, including the link-layer

	address in this case adds little overhead and eliminates a potential

	race condition where the sender deletes the cached link-layer address

	prior to receiving a response to a previous solicitation."

icmp/*:

ratelimit - INTEGER

	Limit the maximal rates for sending ICMPv6 packets.