Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac

[karo-tx-linux.git] / net / bridge / netfilter / ebt_ulog.c

diff --git a/net/bridge/netfilter/ebt_ulog.c b/net/bridge/netfilter/ebt_ulog.c
index 1bd173218f7b8bd6d164adabd9d48f204aa6a292..19063473c71f2efc897e2ee3a51ea023052f15e6 100644 (file)
--- a/net/bridge/netfilter/ebt_ulog.c
+++ b/net/bridge/netfilter/ebt_ulog.c
@@ -156,7 +156,7 @@ static void ebt_ulog_packet(unsigned int hooknr, const struct sk_buff *skb,
        nlh = nlmsg_put(ub->skb, 0, ub->qlen, 0,
                        size - NLMSG_ALIGN(sizeof(*nlh)), 0);
        if (!nlh) {
-               kfree(ub->skb);
+               kfree_skb(ub->skb);
                ub->skb = NULL;
                goto unlock;
        }
@@ -282,6 +282,9 @@ static int __init ebt_ulog_init(void)
 {
        int ret;
        int i;
+       struct netlink_kernel_cfg cfg = {
+               .groups = EBT_ULOG_MAXNLGROUPS,
+       };
 
        if (nlbufsiz >= 128*1024) {
                pr_warning("Netlink buffer has to be <= 128kB,"
@@ -296,8 +299,7 @@ static int __init ebt_ulog_init(void)
        }
 
        ebtulognl = netlink_kernel_create(&init_net, NETLINK_NFLOG,
-                                         EBT_ULOG_MAXNLGROUPS, NULL, NULL,
-                                         THIS_MODULE);
+                                         THIS_MODULE, &cfg);
        if (!ebtulognl)
                ret = -ENOMEM;
        else if ((ret = xt_register_target(&ebt_ulog_tg_reg)) != 0)