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: (1244 commits)
  pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US
  ipv4: Fix fib_trie rebalancing
  Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver
  Bluetooth: Fix Kconfig issue with RFKILL integration
  PIM-SM: namespace changes
  ipv4: update ARPD help text
  net: use a deferred timer in rt_check_expire
  ieee802154: fix kconfig bool/tristate muckup
  bonding: initialization rework
  bonding: use is_zero_ether_addr
  bonding: network device names are case sensative
  bonding: elminate bad refcount code
  bonding: fix style issues
  bonding: fix destructor
  bonding: remove bonding read/write semaphore
  bonding: initialize before registration
  bonding: bond_create always called with default parameters
  x_tables: Convert printk to pr_err
  netfilter: conntrack: optional reliable conntrack event delivery
  list_nulls: add hlist_nulls_add_head and hlist_nulls_del
  ...

1 files changed, 10 insertions, 10 deletions

diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index c2731bfe04d8..b464b9d3d242 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -487,17 +487,17 @@ typedef enum {
          *
          * Value          Cause Code
          * ---------      ----------------
-         * 0x0100          Request to Delete Last Remaining IP Address.
-         * 0x0101          Operation Refused Due to Resource Shortage.
-         * 0x0102          Request to Delete Source IP Address.
-         * 0x0103          Association Aborted due to illegal ASCONF-ACK
-         * 0x0104          Request refused - no authorization.
+         * 0x00A0          Request to Delete Last Remaining IP Address.
+         * 0x00A1          Operation Refused Due to Resource Shortage.
+         * 0x00A2          Request to Delete Source IP Address.
+         * 0x00A3          Association Aborted due to illegal ASCONF-ACK
+         * 0x00A4          Request refused - no authorization.
          */
-        SCTP_ERROR_DEL_LAST_IP  = cpu_to_be16(0x0100),
-        SCTP_ERROR_RSRC_LOW     = cpu_to_be16(0x0101),
-        SCTP_ERROR_DEL_SRC_IP   = cpu_to_be16(0x0102),
-        SCTP_ERROR_ASCONF_ACK   = cpu_to_be16(0x0103),
-        SCTP_ERROR_REQ_REFUSED  = cpu_to_be16(0x0104),
+        SCTP_ERROR_DEL_LAST_IP  = cpu_to_be16(0x00A0),
+        SCTP_ERROR_RSRC_LOW     = cpu_to_be16(0x00A1),
+        SCTP_ERROR_DEL_SRC_IP   = cpu_to_be16(0x00A2),
+        SCTP_ERROR_ASCONF_ACK   = cpu_to_be16(0x00A3),
+        SCTP_ERROR_REQ_REFUSED  = cpu_to_be16(0x00A4),
 
         /* AUTH Section 4.  New Error Cause
          *