Merge branch 'master' of git://blackhole.kfki.hu/nf-next

[platform/kernel/linux-starfive.git] / include / linux / netfilter / ipset / ip_set.h

diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
index 1d100ef..f2e1e6b 100644 (file)
--- a/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
@@ -303,11 +303,11 @@ ip_set_put_flags(struct sk_buff *skb, struct ip_set *set)
 /* Netlink CB args */
 enum {
        IPSET_CB_NET = 0,       /* net namespace */
+       IPSET_CB_PROTO,         /* ipset protocol */
        IPSET_CB_DUMP,          /* dump single set/all sets */
        IPSET_CB_INDEX,         /* set index */
        IPSET_CB_PRIVATE,       /* set private data */
        IPSET_CB_ARG0,          /* type specific */
-       IPSET_CB_ARG1,
 };
 
 /* register and unregister set references */