Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

[~andy/linux] / net / bridge / netfilter / ebt_ulog.c

diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index df0364aa12d518c74b769b04d11c55182323773c..518093802d1d640f3642e997b1481279fad9b68b 100644 (file)
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -271,6 +271,12 @@ static int ebt_ulog_tg_check(const struct xt_tgchk_param *par)
 {
        struct ebt_ulog_info *uloginfo = par->targinfo;
 
+       if (!par->net->xt.ebt_ulog_warn_deprecated) {
+               pr_info("ebt_ulog is deprecated and it will be removed soon, "
+                       "use ebt_nflog instead\n");
+               par->net->xt.ebt_ulog_warn_deprecated = true;
+       }
+
        if (uloginfo->nlgroup > 31)
                return -EINVAL;