Skip to content

Commit 12ad5f6

Browse files
mkubecekdavem330
mkubecek
authored and
davem330
committed
ipset: drop ipset_nest_start() and ipset_nest_end()
After the previous commit, both ipset_nest_start() and ipset_nest_end() are just aliases for nla_nest_start() and nla_nest_end() so that there is no need to keep them. Signed-off-by: Michal Kubecek <mkubecek@suse.cz> Acked-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent ae0be8d commit 12ad5f6

File tree

4 files changed

+25
-28
lines changed

4 files changed

+25
-28
lines changed

‎include/linux/netfilter/ipset/ip_set.h‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -401,33 +401,30 @@ ip_set_get_h16(const struct nlattr *attr)
401401
return ntohs(nla_get_be16(attr));
402402
}
403403

404-
#define ipset_nest_start(skb, attr) nla_nest_start(skb, attr)
405-
#define ipset_nest_end(skb, start) nla_nest_end(skb, start)
406-
407404
static inline int nla_put_ipaddr4(struct sk_buff *skb, int type, __be32 ipaddr)
408405
{
409-
struct nlattr *__nested = ipset_nest_start(skb, type);
406+
struct nlattr *__nested = nla_nest_start(skb, type);
410407
int ret;
411408

412409
if (!__nested)
413410
return -EMSGSIZE;
414411
ret = nla_put_in_addr(skb, IPSET_ATTR_IPADDR_IPV4, ipaddr);
415412
if (!ret)
416-
ipset_nest_end(skb, __nested);
413+
nla_nest_end(skb, __nested);
417414
return ret;
418415
}
419416

420417
static inline int nla_put_ipaddr6(struct sk_buff *skb, int type,
421418
const struct in6_addr *ipaddrptr)
422419
{
423-
struct nlattr *__nested = ipset_nest_start(skb, type);
420+
struct nlattr *__nested = nla_nest_start(skb, type);
424421
int ret;
425422

426423
if (!__nested)
427424
return -EMSGSIZE;
428425
ret = nla_put_in6_addr(skb, IPSET_ATTR_IPADDR_IPV6, ipaddrptr);
429426
if (!ret)
430-
ipset_nest_end(skb, __nested);
427+
nla_nest_end(skb, __nested);
431428
return ret;
432429
}
433430

‎net/netfilter/ipset/ip_set_bitmap_gen.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ mtype_head(struct ip_set *set, struct sk_buff *skb)
9999
struct nlattr *nested;
100100
size_t memsize = mtype_memsize(map, set->dsize) + set->ext_size;
101101

102-
nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
102+
nested = nla_nest_start(skb, IPSET_ATTR_DATA);
103103
if (!nested)
104104
goto nla_put_failure;
105105
if (mtype_do_head(skb, map) ||
@@ -109,7 +109,7 @@ mtype_head(struct ip_set *set, struct sk_buff *skb)
109109
goto nla_put_failure;
110110
if (unlikely(ip_set_put_flags(skb, set)))
111111
goto nla_put_failure;
112-
ipset_nest_end(skb, nested);
112+
nla_nest_end(skb, nested);
113113

114114
return 0;
115115
nla_put_failure:
@@ -213,7 +213,7 @@ mtype_list(const struct ip_set *set,
213213
u32 id, first = cb->args[IPSET_CB_ARG0];
214214
int ret = 0;
215215

216-
adt = ipset_nest_start(skb, IPSET_ATTR_ADT);
216+
adt = nla_nest_start(skb, IPSET_ATTR_ADT);
217217
if (!adt)
218218
return -EMSGSIZE;
219219
/* Extensions may be replaced */
@@ -230,7 +230,7 @@ mtype_list(const struct ip_set *set,
230230
#endif
231231
ip_set_timeout_expired(ext_timeout(x, set))))
232232
continue;
233-
nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
233+
nested = nla_nest_start(skb, IPSET_ATTR_DATA);
234234
if (!nested) {
235235
if (id == first) {
236236
nla_nest_cancel(skb, adt);
@@ -244,9 +244,9 @@ mtype_list(const struct ip_set *set,
244244
goto nla_put_failure;
245245
if (ip_set_put_extensions(skb, set, x, mtype_is_filled(x)))
246246
goto nla_put_failure;
247-
ipset_nest_end(skb, nested);
247+
nla_nest_end(skb, nested);
248248
}
249-
ipset_nest_end(skb, adt);
249+
nla_nest_end(skb, adt);
250250

251251
/* Set listing finished */
252252
cb->args[IPSET_CB_ARG0] = 0;
@@ -259,7 +259,7 @@ mtype_list(const struct ip_set *set,
259259
cb->args[IPSET_CB_ARG0] = 0;
260260
ret = -EMSGSIZE;
261261
}
262-
ipset_nest_end(skb, adt);
262+
nla_nest_end(skb, adt);
263263
out:
264264
rcu_read_unlock();
265265
return ret;

‎net/netfilter/ipset/ip_set_hash_gen.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,7 @@ mtype_head(struct ip_set *set, struct sk_buff *skb)
10571057
htable_bits = t->htable_bits;
10581058
rcu_read_unlock_bh();
10591059

1060-
nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
1060+
nested = nla_nest_start(skb, IPSET_ATTR_DATA);
10611061
if (!nested)
10621062
goto nla_put_failure;
10631063
if (nla_put_net32(skb, IPSET_ATTR_HASHSIZE,
@@ -1079,7 +1079,7 @@ mtype_head(struct ip_set *set, struct sk_buff *skb)
10791079
goto nla_put_failure;
10801080
if (unlikely(ip_set_put_flags(skb, set)))
10811081
goto nla_put_failure;
1082-
ipset_nest_end(skb, nested);
1082+
nla_nest_end(skb, nested);
10831083

10841084
return 0;
10851085
nla_put_failure:
@@ -1124,7 +1124,7 @@ mtype_list(const struct ip_set *set,
11241124
void *incomplete;
11251125
int i, ret = 0;
11261126

1127-
atd = ipset_nest_start(skb, IPSET_ATTR_ADT);
1127+
atd = nla_nest_start(skb, IPSET_ATTR_ADT);
11281128
if (!atd)
11291129
return -EMSGSIZE;
11301130

@@ -1150,7 +1150,7 @@ mtype_list(const struct ip_set *set,
11501150
continue;
11511151
pr_debug("list hash %lu hbucket %p i %u, data %p\n",
11521152
cb->args[IPSET_CB_ARG0], n, i, e);
1153-
nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
1153+
nested = nla_nest_start(skb, IPSET_ATTR_DATA);
11541154
if (!nested) {
11551155
if (cb->args[IPSET_CB_ARG0] == first) {
11561156
nla_nest_cancel(skb, atd);
@@ -1163,10 +1163,10 @@ mtype_list(const struct ip_set *set,
11631163
goto nla_put_failure;
11641164
if (ip_set_put_extensions(skb, set, e, true))
11651165
goto nla_put_failure;
1166-
ipset_nest_end(skb, nested);
1166+
nla_nest_end(skb, nested);
11671167
}
11681168
}
1169-
ipset_nest_end(skb, atd);
1169+
nla_nest_end(skb, atd);
11701170
/* Set listing finished */
11711171
cb->args[IPSET_CB_ARG0] = 0;
11721172

@@ -1180,7 +1180,7 @@ mtype_list(const struct ip_set *set,
11801180
cb->args[IPSET_CB_ARG0] = 0;
11811181
ret = -EMSGSIZE;
11821182
} else {
1183-
ipset_nest_end(skb, atd);
1183+
nla_nest_end(skb, atd);
11841184
}
11851185
out:
11861186
rcu_read_unlock();

‎net/netfilter/ipset/ip_set_list_set.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ list_set_head(struct ip_set *set, struct sk_buff *skb)
466466
struct nlattr *nested;
467467
size_t memsize = list_set_memsize(map, set->dsize) + set->ext_size;
468468

469-
nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
469+
nested = nla_nest_start(skb, IPSET_ATTR_DATA);
470470
if (!nested)
471471
goto nla_put_failure;
472472
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)
476476
goto nla_put_failure;
477477
if (unlikely(ip_set_put_flags(skb, set)))
478478
goto nla_put_failure;
479-
ipset_nest_end(skb, nested);
479+
nla_nest_end(skb, nested);
480480

481481
return 0;
482482
nla_put_failure:
@@ -494,7 +494,7 @@ list_set_list(const struct ip_set *set,
494494
struct set_elem *e;
495495
int ret = 0;
496496

497-
atd = ipset_nest_start(skb, IPSET_ATTR_ADT);
497+
atd = nla_nest_start(skb, IPSET_ATTR_ADT);
498498
if (!atd)
499499
return -EMSGSIZE;
500500

@@ -506,19 +506,19 @@ list_set_list(const struct ip_set *set,
506506
i++;
507507
continue;
508508
}
509-
nested = ipset_nest_start(skb, IPSET_ATTR_DATA);
509+
nested = nla_nest_start(skb, IPSET_ATTR_DATA);
510510
if (!nested)
511511
goto nla_put_failure;
512512
ip_set_name_byindex(map->net, e->id, name);
513513
if (nla_put_string(skb, IPSET_ATTR_NAME, name))
514514
goto nla_put_failure;
515515
if (ip_set_put_extensions(skb, set, e, true))
516516
goto nla_put_failure;
517-
ipset_nest_end(skb, nested);
517+
nla_nest_end(skb, nested);
518518
i++;
519519
}
520520

521-
ipset_nest_end(skb, atd);
521+
nla_nest_end(skb, atd);
522522
/* Set listing finished */
523523
cb->args[IPSET_CB_ARG0] = 0;
524524
goto out;
@@ -531,7 +531,7 @@ list_set_list(const struct ip_set *set,
531531
ret = -EMSGSIZE;
532532
} else {
533533
cb->args[IPSET_CB_ARG0] = i;
534-
ipset_nest_end(skb, atd);
534+
nla_nest_end(skb, atd);
535535
}
536536
out:
537537
rcu_read_unlock();

0 commit comments

Comments
 (0)