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

[pandora-kernel.git] / include / linux / ipv6.h

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index b90d3d4..10b666b 100644 (file)
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -53,7 +53,7 @@ struct ipv6_opt_hdr {
        /* 
         * TLV encoded option data follows.
         */
-};
+} __attribute__ ((packed));    /* required for some archs */
 
 #define ipv6_destopt_hdr ipv6_opt_hdr
 #define ipv6_hopopt_hdr  ipv6_opt_hdr
@@ -159,6 +159,9 @@ struct ipv6_devconf {
        __s32           accept_source_route;
 #ifdef CONFIG_IPV6_OPTIMISTIC_DAD
        __s32           optimistic_dad;
+#endif
+#ifdef CONFIG_IPV6_MROUTE
+       __s32           mc_forwarding;
 #endif
        void            *sysctl;
 };
@@ -190,6 +193,7 @@ enum {
        DEVCONF_PROXY_NDP,
        DEVCONF_OPTIMISTIC_DAD,
        DEVCONF_ACCEPT_SOURCE_ROUTE,
+       DEVCONF_MC_FORWARDING,
        DEVCONF_MAX
 };
 
@@ -230,6 +234,7 @@ struct inet6_skb_parm {
 #endif
 
 #define IP6SKB_XFRM_TRANSFORMED        1
+#define IP6SKB_FORWARDED       2
 };
 
 #define IP6CB(skb)     ((struct inet6_skb_parm*)((skb)->cb))