* [PATCH net-next v2] net: psample: fix build error when CONFIG_INET is not enabled
@ 2020-05-22 20:05 Randy Dunlap
2020-05-23 23:36 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Randy Dunlap @ 2020-05-22 20:05 UTC (permalink / raw)
To: LKML, netdev, linux-next, David Miller, Yotam Gigi, Cong Wang
From: Randy Dunlap <rdunlap@infradead.org>
Fix psample build error when CONFIG_INET is not set/enabled by
bracketing the tunnel code in #ifdef CONFIG_NET / #endif.
../net/psample/psample.c: In function ‘__psample_ip_tun_to_nlattr’:
../net/psample/psample.c:216:25: error: implicit declaration of function ‘ip_tunnel_info_opts’; did you mean ‘ip_tunnel_info_opts_set’? [-Werror=implicit-function-declaration]
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Yotam Gigi <yotam.gi@gmail.com>
Cc: Cong Wang <xiyou.wangcong@gmail.com>
---
v2: Just bracket the new tunnel support code inside ifdef/endif (Cong Wang).
net/psample/psample.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- linux-next-20200522.orig/net/psample/psample.c
+++ linux-next-20200522/net/psample/psample.c
@@ -209,6 +209,7 @@ void psample_group_put(struct psample_gr
}
EXPORT_SYMBOL_GPL(psample_group_put);
+#ifdef CONFIG_INET
static int __psample_ip_tun_to_nlattr(struct sk_buff *skb,
struct ip_tunnel_info *tun_info)
{
@@ -352,12 +353,15 @@ static int psample_tunnel_meta_len(struc
return sum;
}
+#endif
void psample_sample_packet(struct psample_group *group, struct sk_buff *skb,
u32 trunc_size, int in_ifindex, int out_ifindex,
u32 sample_rate)
{
+#ifdef CONFIG_INET
struct ip_tunnel_info *tun_info;
+#endif
struct sk_buff *nl_skb;
int data_len;
int meta_len;
@@ -371,9 +375,11 @@ void psample_sample_packet(struct psampl
nla_total_size(sizeof(u32)) + /* group_num */
nla_total_size(sizeof(u32)); /* seq */
+#ifdef CONFIG_INET
tun_info = skb_tunnel_info(skb);
if (tun_info)
meta_len += psample_tunnel_meta_len(tun_info);
+#endif
data_len = min(skb->len, trunc_size);
if (meta_len + nla_total_size(data_len) > PSAMPLE_MAX_PACKET_SIZE)
@@ -429,11 +435,13 @@ void psample_sample_packet(struct psampl
goto error;
}
+#ifdef CONFIG_INET
if (tun_info) {
ret = psample_ip_tun_to_nlattr(nl_skb, tun_info);
if (unlikely(ret < 0))
goto error;
}
+#endif
genlmsg_end(nl_skb, data);
genlmsg_multicast_netns(&psample_nl_family, group->net, nl_skb, 0,
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH net-next v2] net: psample: fix build error when CONFIG_INET is not enabled
2020-05-22 20:05 [PATCH net-next v2] net: psample: fix build error when CONFIG_INET is not enabled Randy Dunlap
@ 2020-05-23 23:36 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2020-05-23 23:36 UTC (permalink / raw)
To: rdunlap; +Cc: linux-kernel, netdev, linux-next, yotam.gi, xiyou.wangcong
From: Randy Dunlap <rdunlap@infradead.org>
Date: Fri, 22 May 2020 13:05:26 -0700
> From: Randy Dunlap <rdunlap@infradead.org>
>
> Fix psample build error when CONFIG_INET is not set/enabled by
> bracketing the tunnel code in #ifdef CONFIG_NET / #endif.
>
> ../net/psample/psample.c: In function ‘__psample_ip_tun_to_nlattr’:
> ../net/psample/psample.c:216:25: error: implicit declaration of function ‘ip_tunnel_info_opts’; did you mean ‘ip_tunnel_info_opts_set’? [-Werror=implicit-function-declaration]
>
> Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
> Cc: Yotam Gigi <yotam.gi@gmail.com>
> Cc: Cong Wang <xiyou.wangcong@gmail.com>
> ---
> v2: Just bracket the new tunnel support code inside ifdef/endif (Cong Wang).
Applied, thanks Randy.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-23 23:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-22 20:05 [PATCH net-next v2] net: psample: fix build error when CONFIG_INET is not enabled Randy Dunlap
2020-05-23 23:36 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).