trivial: MPT fusion - remove long dead code

[linux-2.6-omap-h63xx.git] / include / linux / ipv6.h

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index b90d3d461d4e57d4a6897370a1399a3c3f7f3a05..641e026eee8f1e3301a3297b85b0d6bafbcaadf5 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
@@ -123,6 +123,7 @@ struct ipv6hdr {
        struct  in6_addr        daddr;
 };
 
+#ifdef __KERNEL__
 /*
  * This structure contains configuration options per IPv6 link.
  */
@@ -160,8 +161,14 @@ struct ipv6_devconf {
 #ifdef CONFIG_IPV6_OPTIMISTIC_DAD
        __s32           optimistic_dad;
 #endif
+#ifdef CONFIG_IPV6_MROUTE
+       __s32           mc_forwarding;
+#endif
+       __s32           disable_ipv6;
+       __s32           accept_dad;
        void            *sysctl;
 };
+#endif
 
 /* index values for the variables in ipv6_devconf */
 enum {
@@ -190,6 +197,9 @@ enum {
        DEVCONF_PROXY_NDP,
        DEVCONF_OPTIMISTIC_DAD,
        DEVCONF_ACCEPT_SOURCE_ROUTE,
+       DEVCONF_MC_FORWARDING,
+       DEVCONF_DISABLE_IPV6,
+       DEVCONF_ACCEPT_DAD,
        DEVCONF_MAX
 };
 
@@ -230,6 +240,7 @@ struct inet6_skb_parm {
 #endif
 
 #define IP6SKB_XFRM_TRANSFORMED        1
+#define IP6SKB_FORWARDED       2
 };
 
 #define IP6CB(skb)     ((struct inet6_skb_parm*)((skb)->cb))
@@ -391,8 +402,10 @@ static inline struct request_sock *inet6_reqsk_alloc(struct request_sock_ops *op
 {
        struct request_sock *req = reqsk_alloc(ops);
 
-       if (req != NULL)
+       if (req != NULL) {
                inet_rsk(req)->inet6_rsk_offset = inet6_rsk_offset(req);
+               inet6_rsk(req)->pktopts = NULL;
+       }
 
        return req;
 }