ipv6: Remove privacy config option.

The code for privacy extentions is very mature, and making it
configurable only gives marginal memory/code savings in exchange
for obfuscation and hard to read code via CPP ifdef'ery.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 1 insertions, 6 deletions

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index a80a63cfb70c..5d89d1b808a6 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -21,13 +21,11 @@ struct ipv6_devconf {
         __s32           force_mld_version;
         __s32           mldv1_unsolicited_report_interval;
         __s32           mldv2_unsolicited_report_interval;
-#ifdef CONFIG_IPV6_PRIVACY
         __s32           use_tempaddr;
         __s32           temp_valid_lft;
         __s32           temp_prefered_lft;
         __s32           regen_max_retry;
         __s32           max_desync_factor;
-#endif
         __s32           max_addresses;
         __s32           accept_ra_defrtr;
         __s32           accept_ra_pinfo;
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h
index 02ef7727bb55..76d54270f2e2 100644
--- a/include/net/if_inet6.h
+++ b/include/net/if_inet6.h
@@ -66,11 +66,10 @@ struct inet6_ifaddr {
         struct hlist_node       addr_lst;
         struct list_head        if_list;
 
-#ifdef CONFIG_IPV6_PRIVACY
         struct list_head        tmp_list;
         struct inet6_ifaddr     *ifpub;
         int                     regen_count;
-#endif
+
         bool                    tokenized;
 
         struct rcu_head         rcu;
@@ -192,11 +191,9 @@ struct inet6_dev {
         __u32                   if_flags;
         int                     dead;
 
-#ifdef CONFIG_IPV6_PRIVACY
         u8                      rndid[8];
         struct timer_list       regen_timer;
         struct list_head        tempaddr_list;
-#endif
 
         struct in6_addr         token;