Re: [PATCH] netfilter: turn NF_HOOK into an inline function
From: Eric W. Biederman <hidden>
Date: 2015-10-09 18:36:24
Also in:
lkml, netfilter-devel
Possibly related (same subject, not in this thread)
- 2015-10-09 · Re: [PATCH] netfilter: turn NF_HOOK into an inline function · Eric W. Biederman <hidden>
- 2015-10-09 · Re: [PATCH] netfilter: turn NF_HOOK into an inline function · Arnd Bergmann <arnd@arndb.de>
- 2015-10-09 · Re: [PATCH] netfilter: turn NF_HOOK into an inline function · kbuild test robot <hidden>
- 2015-10-09 · [PATCH] netfilter: turn NF_HOOK into an inline function · Arnd Bergmann <arnd@arndb.de>
Arnd Bergmann [off-list ref] writes:
A recent change to the dst_output handling caused a new warning when the call to NF_HOOK() is the only used of a local variable passed as 'dev', and CONFIG_NETFILTER is disabled: net/ipv6/ip6_output.c: In function 'ip6_output': net/ipv6/ip6_output.c:135:21: warning: unused variable 'dev' [-Wunused-variable] The reason for this is that the NF_HOOK macro in this case does not reference the variable at all. To avoid that warning now and in the future, this changes the macro into an equivalent inline function, which tells the compiler that the variable is passed correctly but still unused.
For clarification the actual change that trigger this is I passed in net instead of computing net as net = dev_net(dev). Which was the second use of the dev variable.
quoted hunk
Signed-off-by: Arnd Bergmann <arnd@arndb.de> Fixes: ede2059dbaf9 ("dst: Pass net into dst->output")diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h index edb3dc32f1da..1ff5c3f82820 100644 --- a/include/linux/netfilter.h +++ b/include/linux/netfilter.h@@ -347,8 +347,23 @@ nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family) } #else /* !CONFIG_NETFILTER */ -#define NF_HOOK(pf, hook, net, sk, skb, indev, outdev, okfn) (okfn)(net, sk, skb) -#define NF_HOOK_COND(pf, hook, net, sk, skb, indev, outdev, okfn, cond) (okfn)(net, sk, skb) +static inline int +NF_HOOK_COND(uint8_t pf, unsigned int hook, struct net *net, struct sock *sk, + struct sk_buff *skb, struct net_device *in, struct net_device *out, + int (*okfn)(struct net *, struct sock *, struct sk_buff *), + bool cond) +{ + return okfn(net, sk, skb); +} + +static inline int +NF_HOOK(uint8_t pf, unsigned int hook, struct net *net, struct sock *sk, struct sk_buff *skb, + struct net_device *in, struct net_device *out, + int (*okfn)(struct net *, struct sock *, struct sk_buff *)) +{ + return okfn(net, sk, skb); +} + static inline int nf_hook(u_int8_t pf, unsigned int hook, struct net *net, struct sock *sk, struct sk_buff *skb, struct net_device *indev, struct net_device *outdev,