5 files changed, 22 insertions, 8 deletions

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index 10a3eec191fd..41456c148842 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -739,13 +739,13 @@ struct sockaddr_hci {
 struct hci_filter {
         unsigned long type_mask;
         unsigned long event_mask[2];
-        __u16   opcode;
+        __le16   opcode;
 };
 
 struct hci_ufilter {
         __u32   type_mask;
         __u32   event_mask[2];
-        __u16   opcode;
+        __le16   opcode;
 };
 
 #define HCI_FLT_TYPE_BITS       31
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h
index f9cde44f93b4..7be4f4e3a0f2 100644
--- a/include/net/ip6_fib.h
+++ b/include/net/ip6_fib.h
@@ -50,9 +50,9 @@ struct fib6_node
         struct fib6_node        *parent;
         struct fib6_node        *left;
         struct fib6_node        *right;
-
+#ifdef CONFIG_IPV6_SUBTREES
         struct fib6_node        *subtree;
-
+#endif
         struct rt6_info         *leaf;
 
         __u16                   fn_bit;         /* bit key */
diff --git a/include/net/netfilter/nf_conntrack_compat.h b/include/net/netfilter/nf_conntrack_compat.h
index f1b1482d7200..b9ce5c80d9d5 100644
--- a/include/net/netfilter/nf_conntrack_compat.h
+++ b/include/net/netfilter/nf_conntrack_compat.h
@@ -64,6 +64,16 @@ static inline int nf_ct_get_ctinfo(const struct sk_buff *skb,
         return (ct != NULL);
 }
 
+static inline int nf_ct_l3proto_try_module_get(unsigned short l3proto)
+{
+        need_conntrack();
+        return l3proto == PF_INET ? 0 : -1;
+}
+
+static inline void nf_ct_l3proto_module_put(unsigned short l3proto)
+{
+}
+
 #else /* CONFIG_IP_NF_CONNTRACK */
 
 #include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index c089f93ba591..8d7f26d684e5 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -201,13 +201,12 @@ extern struct sctp_globals {
         struct sctp_bind_hashbucket *port_hashtable;
 
         /* This is the global local address list.
-         * We actively maintain this complete list of interfaces on
-         * the system by catching routing events.
+         * We actively maintain this complete list of addresses on
+         * the system by catching address add/delete events.
          *
          * It is a list of sctp_sockaddr_entry.
          */
         struct list_head local_addr_list;
-        spinlock_t local_addr_lock;
         
         /* Flag to indicate if addip is enabled. */
         int addip_enable;
@@ -243,7 +242,6 @@ extern struct sctp_globals {
 #define sctp_port_alloc_lock            (sctp_globals.port_alloc_lock)
 #define sctp_port_hashtable             (sctp_globals.port_hashtable)
 #define sctp_local_addr_list            (sctp_globals.local_addr_list)
-#define sctp_local_addr_lock            (sctp_globals.local_addr_lock)
 #define sctp_addip_enable               (sctp_globals.addip_enable)
 #define sctp_prsctp_enable              (sctp_globals.prsctp_enable)
 
@@ -277,6 +275,7 @@ struct sctp_sock {
         __u16 default_flags;
         __u32 default_context;
         __u32 default_timetolive;
+        __u32 default_rcv_context;
 
         /* Heartbeat interval: The endpoint sends out a Heartbeat chunk to
          * the destination address every heartbeat interval. This value
@@ -1659,6 +1658,9 @@ struct sctp_association {
         __u32 default_context;
         __u32 default_timetolive;
 
+        /* Default receive parameters */
+        __u32 default_rcv_context;
+
         /* This tracks outbound ssn for a given stream.  */
         struct sctp_ssnmap *ssnmap;
 
diff --git a/include/net/sctp/user.h b/include/net/sctp/user.h
index 1b7aae6cdd82..9e4a39fd129d 100644
--- a/include/net/sctp/user.h
+++ b/include/net/sctp/user.h
@@ -95,6 +95,8 @@ enum sctp_optname {
 #define SCTP_GET_PEER_ADDR_INFO SCTP_GET_PEER_ADDR_INFO
         SCTP_DELAYED_ACK_TIME,
 #define SCTP_DELAYED_ACK_TIME SCTP_DELAYED_ACK_TIME
+        SCTP_CONTEXT,   /* Receive Context */
+#define SCTP_CONTEXT SCTP_CONTEXT
 
         /* Internal Socket Options. Some of the sctp library functions are 
          * implemented using these socket options.