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

3 files changed, 10 insertions, 11 deletions

diff --git a/include/linux/netfilter_ipv4/ipt_sctp.h b/include/linux/netfilter_ipv4/ipt_sctp.h
index e93a9ec99fc2..80b3dbacd193 100644
--- a/include/linux/netfilter_ipv4/ipt_sctp.h
+++ b/include/linux/netfilter_ipv4/ipt_sctp.h
@@ -7,8 +7,6 @@
 
 #define IPT_SCTP_VALID_FLAGS            0x07
 
-#define ELEMCOUNT(x) (sizeof(x)/sizeof(x[0]))
-
 
 struct ipt_sctp_flag_info {
         u_int8_t chunktype;
@@ -59,21 +57,21 @@ struct ipt_sctp_info {
 #define SCTP_CHUNKMAP_RESET(chunkmap)                           \
         do {                                                    \
                 int i;                                          \
-                for (i = 0; i < ELEMCOUNT(chunkmap); i++)       \
+                for (i = 0; i < ARRAY_SIZE(chunkmap); i++)      \
                         chunkmap[i] = 0;                        \
         } while (0)
 
 #define SCTP_CHUNKMAP_SET_ALL(chunkmap)                         \
         do {                                                    \
                 int i;                                          \
-                for (i = 0; i < ELEMCOUNT(chunkmap); i++)       \
+                for (i = 0; i < ARRAY_SIZE(chunkmap); i++)      \
                         chunkmap[i] = ~0;                       \
         } while (0)
 
 #define SCTP_CHUNKMAP_COPY(destmap, srcmap)                     \
         do {                                                    \
                 int i;                                          \
-                for (i = 0; i < ELEMCOUNT(chunkmap); i++)       \
+                for (i = 0; i < ARRAY_SIZE(chunkmap); i++)      \
                         destmap[i] = srcmap[i];                 \
         } while (0)
 
@@ -81,7 +79,7 @@ struct ipt_sctp_info {
 ({                                                      \
         int i;                                          \
         int flag = 1;                                   \
-        for (i = 0; i < ELEMCOUNT(chunkmap); i++) {     \
+        for (i = 0; i < ARRAY_SIZE(chunkmap); i++) {    \
                 if (chunkmap[i]) {                      \
                         flag = 0;                       \
                         break;                          \
@@ -94,7 +92,7 @@ struct ipt_sctp_info {
 ({                                                      \
         int i;                                          \
         int flag = 1;                                   \
-        for (i = 0; i < ELEMCOUNT(chunkmap); i++) {     \
+        for (i = 0; i < ARRAY_SIZE(chunkmap); i++) {    \
                 if (chunkmap[i] != ~0) {                \
                         flag = 0;                       \
                                 break;                  \
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 0a8ea8b35816..8c5d6001a923 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -206,6 +206,7 @@ enum {
  *      @nfct: Associated connection, if any
  *      @ipvs_property: skbuff is owned by ipvs
  *      @nfctinfo: Relationship of this skb to the connection
+ *      @nfct_reasm: netfilter conntrack re-assembly pointer
  *      @nf_bridge: Saved data about a bridged frame - see br_netfilter.c
  *      @tc_index: Traffic control index
  *      @tc_verd: traffic control verdict
@@ -264,16 +265,14 @@ struct sk_buff {
                                 nohdr:1,
                                 nfctinfo:3;
         __u8                    pkt_type:3,
-                                fclone:2;
+                                fclone:2,
+                                ipvs_property:1;
         __be16                  protocol;
 
         void                    (*destructor)(struct sk_buff *skb);
 #ifdef CONFIG_NETFILTER
         __u32                   nfmark;
         struct nf_conntrack     *nfct;
-#if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
-        __u8                    ipvs_property:1;
-#endif
 #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
         struct sk_buff          *nfct_reasm;
 #endif
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 6addb4d464d6..0a2ad51cff82 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -237,6 +237,8 @@ extern struct ipv6_txoptions *	ipv6_renew_options(struct sock *sk, struct ipv6_t
                                                    int newtype,
                                                    struct ipv6_opt_hdr __user *newopt,
                                                    int newoptlen);
+struct ipv6_txoptions *ipv6_fixup_options(struct ipv6_txoptions *opt_space,
+                                          struct ipv6_txoptions *opt);
 
 extern int ip6_frag_nqueues;
 extern atomic_t ip6_frag_mem;