| Message ID | 20180319152448.GA30044@lkp-sb05 |
|---|---|
| State | RFC |
| Delegated to: | Pablo Neira |
| Headers | show |
| Series | [RFC] netfilter: nf_tables: nf_tables_allow_nat_conflict() can be static | expand |
kbuild test robot <lkp@intel.com> wrote: > -bool nf_tables_allow_nat_conflict(const struct net *net, > - const struct nf_hook_ops *ops) > +static bool nf_tables_allow_nat_conflict(const struct net *net, > + const struct nf_hook_ops *ops) Right, this has to be static. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Mar 19, 2018 at 04:39:33PM +0100, Florian Westphal wrote: > kbuild test robot <lkp@intel.com> wrote: > > -bool nf_tables_allow_nat_conflict(const struct net *net, > > - const struct nf_hook_ops *ops) > > +static bool nf_tables_allow_nat_conflict(const struct net *net, > > + const struct nf_hook_ops *ops) > > Right, this has to be static. Folded this patch here before applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 6923922..d59cc21 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -89,8 +89,8 @@ static void nft_trans_destroy(struct nft_trans *trans) * Either transaction is aborted (new/colliding hook is removed), or * transaction is committed (old hook is removed). */ -bool nf_tables_allow_nat_conflict(const struct net *net, - const struct nf_hook_ops *ops) +static bool nf_tables_allow_nat_conflict(const struct net *net, + const struct nf_hook_ops *ops) { const struct nft_trans *trans; bool ret = false;
Fixes: 301c9cd2848d ("netfilter: nf_tables: permit second nat hook if colliding hook is going away") Signed-off-by: Fengguang Wu <fengguang.wu@intel.com> --- nf_tables_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html