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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1815 commits)
  mac80211: fix reorder buffer release
  iwmc3200wifi: Enable wimax core through module parameter
  iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter
  iwmc3200wifi: Coex table command does not expect a response
  iwmc3200wifi: Update wiwi priority table
  iwlwifi: driver version track kernel version
  iwlwifi: indicate uCode type when fail dump error/event log
  iwl3945: remove duplicated event logging code
  b43: fix two warnings
  ipw2100: fix rebooting hang with driver loaded
  cfg80211: indent regulatory messages with spaces
  iwmc3200wifi: fix NULL pointer dereference in pmkid update
  mac80211: Fix TX status reporting for injected data frames
  ath9k: enable 2GHz band only if the device supports it
  airo: Fix integer overflow warning
  rt2x00: Fix padding bug on L2PAD devices.
  WE: Fix set events not propagated
  b43legacy: avoid PPC fault during resume
  b43: avoid PPC fault during resume
  tcp: fix a timewait refcnt race
  ...

Fix up conflicts due to sysctl cleanups (dead sysctl_check code and
CTL_UNNUMBERED removed) in
	kernel/sysctl_check.c
	net/ipv4/sysctl_net_ipv4.c
	net/ipv6/addrconf.c
	net/sctp/sysctl.c

6 files changed, 109 insertions, 28 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index f613df8ec7bf..a004b04ffd3a 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -317,18 +317,6 @@ Who:	ocfs2-devel@oss.oracle.com
 
 ---------------------------
 
-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
diff --git a/Documentation/isdn/README.gigaset b/Documentation/isdn/README.gigaset
index f9963103ae3d..0fc9831d7ecb 100644
--- a/Documentation/isdn/README.gigaset
+++ b/Documentation/isdn/README.gigaset
@@ -5,7 +5,7 @@ GigaSet 307x Device Driver
      ------------
 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:
 
@@ -33,7 +33,7 @@ GigaSet 307x Device Driver
               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
@@ -49,7 +49,7 @@ GigaSet 307x Device Driver
      --------
      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/
@@ -102,20 +102,28 @@ GigaSet 307x Device Driver
 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.
@@ -160,7 +168,7 @@ GigaSet 307x Device Driver
      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
@@ -188,7 +196,7 @@ GigaSet 307x Device Driver
      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
@@ -228,7 +236,7 @@ GigaSet 307x Device Driver
         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:
@@ -236,7 +244,7 @@ GigaSet 307x Device Driver
         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
      ----------------------------------------------
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index fce5b5e516cc..495a39a77341 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2605,6 +2605,9 @@ and is between 256 and 4096 characters. It is defined in the file
         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
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index d5181ce9ff62..61f516b135b4 100644
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -1,7 +1,7 @@
 
                 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 :
@@ -614,6 +614,46 @@ primary
 
         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
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index fbe427a6580c..006b39dec87d 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -164,6 +164,14 @@ tcp_congestion_control - STRING
         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.
 
@@ -723,6 +731,12 @@ accept_source_route - BOOLEAN
         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
@@ -738,8 +752,8 @@ rp_filter - INTEGER
         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.
@@ -1086,6 +1100,24 @@ accept_dad - INTEGER
         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.
diff --git a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt b/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt
index 8447fd7090d0..cabc780f7258 100644
--- a/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt
+++ b/Documentation/powerpc/dts-bindings/fsl/mpc5200.txt
@@ -178,3 +178,13 @@ External interrupts:
         external irq3:  interrupts = <1 3 n>;
 'n' is sense (0: level high, 1: edge rising, 2: edge falling 3: level low)
 
+fsl,mpc5200-mscan nodes
+-----------------------
+In addition to the required compatible-, reg- and interrupt-properites, you can
+also specify which clock source shall be used for the controller:
+
+- fsl,mscan-clock-source- a string describing the clock source. Valid values
+                          are:  "ip" for ip bus clock
+                                "ref" for reference clock (XTAL)
+                          "ref" is default in case this property is not
+                          present.