3 files changed, 1 insertions, 3 deletions

diff --git a/include/linux/in6.h b/include/linux/in6.h
index f8256c582845..dcf5720ffcbb 100644
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -156,7 +156,7 @@ struct in6_flowlabel_req
 #define IPV6_CHECKSUM           7
 #define IPV6_HOPLIMIT           8
 #define IPV6_NEXTHOP            9
-#define IPV6_AUTHHDR            10
+#define IPV6_AUTHHDR            10      /* obsolete */
 #define IPV6_FLOWINFO           11
 
 #define IPV6_UNICAST_HOPS       16
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 771b47e30f86..69324465e8b3 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -183,7 +183,6 @@ struct ipv6_txoptions
         struct ipv6_opt_hdr     *hopopt;
         struct ipv6_opt_hdr     *dst0opt;
         struct ipv6_rt_hdr      *srcrt; /* Routing Header */
-        struct ipv6_opt_hdr     *auth;
         struct ipv6_opt_hdr     *dst1opt;
 
         /* Option buffer, as read by IPV6_PKTOPTIONS, starts here. */
diff --git a/net/ipv6/ip6_flowlabel.c b/net/ipv6/ip6_flowlabel.c
index 0e5f7499debb..b6c73da5ff35 100644
--- a/net/ipv6/ip6_flowlabel.c
+++ b/net/ipv6/ip6_flowlabel.c
@@ -244,7 +244,6 @@ struct ipv6_txoptions *fl6_merge_options(struct ipv6_txoptions * opt_space,
                 opt_space->opt_nflen = 0;
         }
         opt_space->dst1opt = fopt->dst1opt;
-        opt_space->auth = fopt->auth;
         opt_space->opt_flen = fopt->opt_flen;
         return opt_space;
 }