4 files changed, 25 insertions, 28 deletions

diff --git a/include/linux/netfilter/ipset/ip_set.h b/include/linux/netfilter/ipset/ip_set.h
index 965dc6c6653e..e499d170f12d 100644
--- a/include/linux/netfilter/ipset/ip_set.h
+++ b/include/linux/netfilter/ipset/ip_set.h
@@ -401,33 +401,30 @@ ip_set_get_h16(const struct nlattr *attr)
         return ntohs(nla_get_be16(attr));
 }
 
-#define ipset_nest_start(skb, attr) nla_nest_start(skb, attr)
-#define ipset_nest_end(skb, start)  nla_nest_end(skb, start)
-
 static inline int nla_put_ipaddr4(struct sk_buff *skb, int type, __be32 ipaddr)
 {
-        struct nlattr *__nested = ipset_nest_start(skb, type);
+        struct nlattr *__nested = nla_nest_start(skb, type);
         int ret;
 
         if (!__nested)
                 return -EMSGSIZE;
         ret = nla_put_in_addr(skb, IPSET_ATTR_IPADDR_IPV4, ipaddr);
         if (!ret)
-                ipset_nest_end(skb, __nested);
+                nla_nest_end(skb, __nested);
         return ret;
 }
 
 static inline int nla_put_ipaddr6(struct sk_buff *skb, int type,
                                   const struct in6_addr *ipaddrptr)
 {
-        struct nlattr *__nested = ipset_nest_start(skb, type);
+        struct nlattr *__nested = nla_nest_start(skb, type);
         int ret;
 
         if (!__nested)
                 return -EMSGSIZE;
         ret = nla_put_in6_addr(skb, IPSET_ATTR_IPADDR_IPV6, ipaddrptr);
         if (!ret)
-                ipset_nest_end(skb, __nested);
+                nla_nest_end(skb, __nested);
         return ret;
 }
 
diff --git a/net/netfilter/ipset/ip_set_bitmap_gen.h b/net/netfilter/ipset/ip_set_bitmap_gen.h
index 257ca393e6f2..38ef2ea838cb 100644
--- a/net/netfilter/ipset/ip_set_bitmap_gen.h
+++ b/net/netfilter/ipset/ip_set_bitmap_gen.h
@@ -99,7 +99,7 @@ mtype_head(struct ip_set *set, struct sk_buff *skb)
         struct nlattr *nested;
         size_t memsize = mtype_memsize(map, set->dsize) + set->ext_size;
 
-        nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
+        nested = nla_nest_start(skb, IPSET_ATTR_DATA);
         if (!nested)
                 goto nla_put_failure;
         if (mtype_do_head(skb, map) ||
@@ -109,7 +109,7 @@ mtype_head(struct ip_set *set, struct sk_buff *skb)
                 goto nla_put_failure;
         if (unlikely(ip_set_put_flags(skb, set)))
                 goto nla_put_failure;
-        ipset_nest_end(skb, nested);
+        nla_nest_end(skb, nested);
 
         return 0;
 nla_put_failure:
@@ -213,7 +213,7 @@ mtype_list(const struct ip_set *set,
         u32 id, first = cb->args[IPSET_CB_ARG0];
         int ret = 0;
 
-        adt = ipset_nest_start(skb, IPSET_ATTR_ADT);
+        adt = nla_nest_start(skb, IPSET_ATTR_ADT);
         if (!adt)
                 return -EMSGSIZE;
         /* Extensions may be replaced */
@@ -230,7 +230,7 @@ mtype_list(const struct ip_set *set,
 #endif
                      ip_set_timeout_expired(ext_timeout(x, set))))
                         continue;
-                nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
+                nested = nla_nest_start(skb, IPSET_ATTR_DATA);
                 if (!nested) {
                         if (id == first) {
                                 nla_nest_cancel(skb, adt);
@@ -244,9 +244,9 @@ mtype_list(const struct ip_set *set,
                         goto nla_put_failure;
                 if (ip_set_put_extensions(skb, set, x, mtype_is_filled(x)))
                         goto nla_put_failure;
-                ipset_nest_end(skb, nested);
+                nla_nest_end(skb, nested);
         }
-        ipset_nest_end(skb, adt);
+        nla_nest_end(skb, adt);
 
         /* Set listing finished */
         cb->args[IPSET_CB_ARG0] = 0;
@@ -259,7 +259,7 @@ nla_put_failure:
                 cb->args[IPSET_CB_ARG0] = 0;
                 ret = -EMSGSIZE;
         }
-        ipset_nest_end(skb, adt);
+        nla_nest_end(skb, adt);
 out:
         rcu_read_unlock();
         return ret;
diff --git a/net/netfilter/ipset/ip_set_hash_gen.h b/net/netfilter/ipset/ip_set_hash_gen.h
index 2c9609929c71..01d51f775f12 100644
--- a/net/netfilter/ipset/ip_set_hash_gen.h
+++ b/net/netfilter/ipset/ip_set_hash_gen.h
@@ -1057,7 +1057,7 @@ mtype_head(struct ip_set *set, struct sk_buff *skb)
         htable_bits = t->htable_bits;
         rcu_read_unlock_bh();
 
-        nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
+        nested = nla_nest_start(skb, IPSET_ATTR_DATA);
         if (!nested)
                 goto nla_put_failure;
         if (nla_put_net32(skb, IPSET_ATTR_HASHSIZE,
@@ -1079,7 +1079,7 @@ mtype_head(struct ip_set *set, struct sk_buff *skb)
                 goto nla_put_failure;
         if (unlikely(ip_set_put_flags(skb, set)))
                 goto nla_put_failure;
-        ipset_nest_end(skb, nested);
+        nla_nest_end(skb, nested);
 
         return 0;
 nla_put_failure:
@@ -1124,7 +1124,7 @@ mtype_list(const struct ip_set *set,
         void *incomplete;
         int i, ret = 0;
 
-        atd = ipset_nest_start(skb, IPSET_ATTR_ADT);
+        atd = nla_nest_start(skb, IPSET_ATTR_ADT);
         if (!atd)
                 return -EMSGSIZE;
 
@@ -1150,7 +1150,7 @@ mtype_list(const struct ip_set *set,
                                 continue;
                         pr_debug("list hash %lu hbucket %p i %u, data %p\n",
                                  cb->args[IPSET_CB_ARG0], n, i, e);
-                        nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
+                        nested = nla_nest_start(skb, IPSET_ATTR_DATA);
                         if (!nested) {
                                 if (cb->args[IPSET_CB_ARG0] == first) {
                                         nla_nest_cancel(skb, atd);
@@ -1163,10 +1163,10 @@ mtype_list(const struct ip_set *set,
                                 goto nla_put_failure;
                         if (ip_set_put_extensions(skb, set, e, true))
                                 goto nla_put_failure;
-                        ipset_nest_end(skb, nested);
+                        nla_nest_end(skb, nested);
                 }
         }
-        ipset_nest_end(skb, atd);
+        nla_nest_end(skb, atd);
         /* Set listing finished */
         cb->args[IPSET_CB_ARG0] = 0;
 
@@ -1180,7 +1180,7 @@ nla_put_failure:
                 cb->args[IPSET_CB_ARG0] = 0;
                 ret = -EMSGSIZE;
         } else {
-                ipset_nest_end(skb, atd);
+                nla_nest_end(skb, atd);
         }
 out:
         rcu_read_unlock();
diff --git a/net/netfilter/ipset/ip_set_list_set.c b/net/netfilter/ipset/ip_set_list_set.c
index 8da228da53ae..4f894165cdcd 100644
--- a/net/netfilter/ipset/ip_set_list_set.c
+++ b/net/netfilter/ipset/ip_set_list_set.c
@@ -466,7 +466,7 @@ list_set_head(struct ip_set *set, struct sk_buff *skb)
         struct nlattr *nested;
         size_t memsize = list_set_memsize(map, set->dsize) + set->ext_size;
 
-        nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
+        nested = nla_nest_start(skb, IPSET_ATTR_DATA);
         if (!nested)
                 goto nla_put_failure;
         if (nla_put_net32(skb, IPSET_ATTR_SIZE, htonl(map->size)) ||
@@ -476,7 +476,7 @@ list_set_head(struct ip_set *set, struct sk_buff *skb)
                 goto nla_put_failure;
         if (unlikely(ip_set_put_flags(skb, set)))
                 goto nla_put_failure;
-        ipset_nest_end(skb, nested);
+        nla_nest_end(skb, nested);
 
         return 0;
 nla_put_failure:
@@ -494,7 +494,7 @@ list_set_list(const struct ip_set *set,
         struct set_elem *e;
         int ret = 0;
 
-        atd = ipset_nest_start(skb, IPSET_ATTR_ADT);
+        atd = nla_nest_start(skb, IPSET_ATTR_ADT);
         if (!atd)
                 return -EMSGSIZE;
 
@@ -506,7 +506,7 @@ list_set_list(const struct ip_set *set,
                         i++;
                         continue;
                 }
-                nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
+                nested = nla_nest_start(skb, IPSET_ATTR_DATA);
                 if (!nested)
                         goto nla_put_failure;
                 ip_set_name_byindex(map->net, e->id, name);
@@ -514,11 +514,11 @@ list_set_list(const struct ip_set *set,
                         goto nla_put_failure;
                 if (ip_set_put_extensions(skb, set, e, true))
                         goto nla_put_failure;
-                ipset_nest_end(skb, nested);
+                nla_nest_end(skb, nested);
                 i++;
         }
 
-        ipset_nest_end(skb, atd);
+        nla_nest_end(skb, atd);
         /* Set listing finished */
         cb->args[IPSET_CB_ARG0] = 0;
         goto out;
@@ -531,7 +531,7 @@ nla_put_failure:
                 ret = -EMSGSIZE;
         } else {
                 cb->args[IPSET_CB_ARG0] = i;
-                ipset_nest_end(skb, atd);
+                nla_nest_end(skb, atd);
         }
 out:
         rcu_read_unlock();