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]: fix broken uses of NIPQUAD in net/atm
  [SCTP]: sctp_unpack_cookie() fix
  [SCTP]: Fix unintentional change to SCTP_ASSERT when !SCTP_DEBUG
  [NET]: Prevent multiple qdisc runs
  [CONNECTOR]: Initialize subsystem earlier.
  [NETFILTER]: xt_sctp: fix endless loop caused by 0 chunk length

diff --combined include/linux/netdevice.h
index 5e8e2d50429a14c0fed74692e5a1616a842b9295,39919c882a253bd218e1a4184e995ddc6af751b0..cead6be467ed6e520c99a98c35e828115e375ad6
--- 1/include/linux/netdevice.h
--- 2/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@@ -34,6 -34,7 +34,6 @@@
  #include <asm/cache.h>
  #include <asm/byteorder.h>
  
 -#include <linux/config.h>
  #include <linux/device.h>
  #include <linux/percpu.h>
  #include <linux/dmaengine.h>
@@@ -232,6 -233,7 +232,7 @@@ enum netdev_state_
        __LINK_STATE_RX_SCHED,
        __LINK_STATE_LINKWATCH_PENDING,
        __LINK_STATE_DORMANT,
+       __LINK_STATE_QDISC_RUNNING,
  };
  
  

diff --combined include/net/sctp/sctp.h
index 237f82b05e407accab599638be4aea96a291599f,aa6033ca7cd859d3614406a54b0d4885e79a94dc..a9663b49ea54ba494ec2ca523e309d69008cffeb
--- 1/include/net/sctp/sctp.h
--- 2/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.h
@@@ -63,6 -63,7 +63,6 @@@
   */
  
  
 -#include <linux/config.h>
  
  #ifdef TEST_FRAME
  #undef CONFIG_PROC_FS
@@@ -254,7 -255,7 +254,7 @@@ extern int sctp_debug_flag
  #define SCTP_DEBUG_PRINTK_IPADDR(whatever...)
  #define SCTP_ENABLE_DEBUG
  #define SCTP_DISABLE_DEBUG
- #define SCTP_ASSERT(expr, str, func) BUG_ON(!(expr))
+ #define SCTP_ASSERT(expr, str, func)
  
  #endif /* SCTP_DEBUG */