ipv6: mcast: RCU conversion

[net-next-2.6.git] / include / linux / ipv6.h

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index ab9e9e89e4074318405a595c1147642e344255c0..0c997767429a79db596a25cb8611355fdb29c6d9 100644 (file)
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -58,7 +58,7 @@ struct ipv6_opt_hdr {
        /* 
         * TLV encoded option data follows.
         */
-} __packed;    /* required for some archs */
+} __attribute__((packed));     /* required for some archs */
 
 #define ipv6_destopt_hdr ipv6_opt_hdr
 #define ipv6_hopopt_hdr  ipv6_opt_hdr
@@ -99,7 +99,7 @@ struct ipv6_destopt_hao {
        __u8                    type;
        __u8                    length;
        struct in6_addr         addr;
-} __packed;
+} __attribute__((packed));
 
 /*
  *     IPv6 fixed header
@@ -341,7 +341,9 @@ struct ipv6_pinfo {
                                odstopts:1,
                                 rxflow:1,
                                rxtclass:1,
-                               rxpmtu:1;
+                               rxpmtu:1,
+                               rxorigdstaddr:1;
+                               /* 2 bits hole */
                } bits;
                __u16           all;
        } rxopt;
@@ -362,7 +364,7 @@ struct ipv6_pinfo {
 
        __u32                   dst_cookie;
 
-       struct ipv6_mc_socklist *ipv6_mc_list;
+       struct ipv6_mc_socklist __rcu *ipv6_mc_list;
        struct ipv6_ac_socklist *ipv6_ac_list;
        struct ipv6_fl_socklist *ipv6_fl_list;