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:
  [UDP]: Fix reversed logic in udp_get_port().
  [IPV6]: Dumb typo in generic csum_ipv6_magic()
  [SCTP]: make 2 functions static
  [SCTP]: Fix typo adaption -> adaptation as per the latest API draft.
  [SCTP]: Don't export include/linux/sctp.h to userspace.
  [TCP]: Fix ambiguity in the `before' relation.
  [ATM] drivers/atm/fore200e.c: Cleanups.
  [ATM]: Remove dead ATM_TNETA1570 option.
  NetLabel: correctly fill in unused CIPSOv4 level and category mappings
  NetLabel: perform input validation earlier on CIPSOv4 DOI add ops

1 files changed, 4 insertions, 4 deletions

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 8d7f26d684e5..31a8e88f1a74 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -306,7 +306,7 @@ struct sctp_sock {
         __u8 disable_fragments;
         __u8 pd_mode;
         __u8 v4mapped;
-        __u32 adaption_ind;
+        __u32 adaptation_ind;
 
         /* Receive to here while partial delivery is in effect. */
         struct sk_buff_head pd_lobby;
@@ -388,7 +388,7 @@ struct sctp_cookie {
         /* Padding for future use */
         __u8 padding;           
 
-        __u32 adaption_ind;     
+        __u32 adaptation_ind;
 
 
         /* This is a shim for my peer's INIT packet, followed by
@@ -431,7 +431,7 @@ union sctp_params {
         struct sctp_ipv4addr_param *v4;
         struct sctp_ipv6addr_param *v6;
         union sctp_addr_param *addr;
-        struct sctp_adaption_ind_param *aind;
+        struct sctp_adaptation_ind_param *aind;
 };
 
 /* RFC 2960.  Section 3.3.5 Heartbeat.
@@ -1483,7 +1483,7 @@ struct sctp_association {
                 __u8    asconf_capable;  /* Does peer support ADDIP? */
                 __u8    prsctp_capable;  /* Can peer do PR-SCTP? */
 
-                __u32   adaption_ind;    /* Adaption Code point. */
+                __u32   adaptation_ind;  /* Adaptation Code point. */
 
                 /* This mask is used to disable sending the ASCONF chunk
                  * with specified parameter to peer.