Re: [PATCH net-next] ipv6: sr: select DST_CACHE by default

[David Miller]

From: David Lebrun 
Date: Mon, 27 Mar 2017 11:43:59 +0200

> When CONFIG_IPV6_SEG6_LWTUNNEL is selected, automatically select DST_CACHE.
> This allows to remove multiple ifdefs.
> 
> Signed-off-by: David Lebrun 

Applied, thanks for following up on this David.

[PATCH net-next] ipv6: sr: select DST_CACHE by default

[David Lebrun]

When CONFIG_IPV6_SEG6_LWTUNNEL is selected, automatically select DST_CACHE.
This allows to remove multiple ifdefs.

Signed-off-by: David Lebrun 
---
 net/ipv6/Kconfig |  1 +
 net/ipv6/seg6_iptunnel.c | 18 --
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index e2afe677..48c4529 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -307,6 +307,7 @@ config IPV6_SEG6_LWTUNNEL
bool "IPv6: Segment Routing Header encapsulation support"
depends on IPV6
select LWTUNNEL
+   select DST_CACHE
---help---
  Support for encapsulation of packets within an outer IPv6
  header and a Segment Routing Header using the lightweight
diff --git a/net/ipv6/seg6_iptunnel.c b/net/ipv6/seg6_iptunnel.c
index 30ef1d1..a644aae 100644
--- a/net/ipv6/seg6_iptunnel.c
+++ b/net/ipv6/seg6_iptunnel.c
@@ -26,17 +26,13 @@
 #include 
 #include 
 #include 
-#ifdef CONFIG_DST_CACHE
 #include 
-#endif
 #ifdef CONFIG_IPV6_SEG6_HMAC
 #include 
 #endif
 
 struct seg6_lwt {
-#ifdef CONFIG_DST_CACHE
struct dst_cache cache;
-#endif
struct seg6_iptunnel_encap tuninfo[0];
 };
 
@@ -250,17 +246,14 @@ static int seg6_input(struct sk_buff *skb)
 
slwt = seg6_lwt_lwtunnel(orig_dst->lwtstate);
 
-#ifdef CONFIG_DST_CACHE
preempt_disable();
dst = dst_cache_get(>cache);
preempt_enable();
-#endif
 
skb_dst_drop(skb);
 
if (!dst) {
ip6_route_input(skb);
-#ifdef CONFIG_DST_CACHE
dst = skb_dst(skb);
if (!dst->error) {
preempt_disable();
@@ -268,7 +261,6 @@ static int seg6_input(struct sk_buff *skb)
  _hdr(skb)->saddr);
preempt_enable();
}
-#endif
} else {
skb_dst_set(skb, dst);
}
@@ -289,11 +281,9 @@ static int seg6_output(struct net *net, struct sock *sk, 
struct sk_buff *skb)
 
slwt = seg6_lwt_lwtunnel(orig_dst->lwtstate);
 
-#ifdef CONFIG_DST_CACHE
preempt_disable();
dst = dst_cache_get(>cache);
preempt_enable();
-#endif
 
if (unlikely(!dst)) {
struct ipv6hdr *hdr = ipv6_hdr(skb);
@@ -312,11 +302,9 @@ static int seg6_output(struct net *net, struct sock *sk, 
struct sk_buff *skb)
goto drop;
}
 
-#ifdef CONFIG_DST_CACHE
preempt_disable();
dst_cache_set_ip6(>cache, dst, );
preempt_enable();
-#endif
}
 
skb_dst_drop(skb);
@@ -380,13 +368,11 @@ static int seg6_build_state(struct nlattr *nla,
 
slwt = seg6_lwt_lwtunnel(newts);
 
-#ifdef CONFIG_DST_CACHE
err = dst_cache_init(>cache, GFP_KERNEL);
if (err) {
kfree(newts);
return err;
}
-#endif
 
memcpy(>tuninfo, tuninfo, tuninfo_len);
 
@@ -400,12 +386,10 @@ static int seg6_build_state(struct nlattr *nla,
return 0;
 }
 
-#ifdef CONFIG_DST_CACHE
 static void seg6_destroy_state(struct lwtunnel_state *lwt)
 {
dst_cache_destroy(_lwt_lwtunnel(lwt)->cache);
 }
-#endif
 
 static int seg6_fill_encap_info(struct sk_buff *skb,
struct lwtunnel_state *lwtstate)
@@ -439,9 +423,7 @@ static int seg6_encap_cmp(struct lwtunnel_state *a, struct 
lwtunnel_state *b)
 
 static const struct lwtunnel_encap_ops seg6_iptun_ops = {
.build_state = seg6_build_state,
-#ifdef CONFIG_DST_CACHE
.destroy_state = seg6_destroy_state,
-#endif
.output = seg6_output,
.input = seg6_input,
.fill_encap = seg6_fill_encap_info,
-- 
2.10.2