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.
Showing the changes to include/linux (1 of 4 files). Show all
Unified · Split
| @@ -401,33 +401,30 @@ ip_set_get_h16(const struct nlattr *attr) · 400 unmodified lines | ||
| 401 | 401 | return ntohs(nla_get_be16(attr)); |
| 402 | 402 | } |
| 403 | 403 | |
| 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 | − | |
| 407 | 404 | static inline int nla_put_ipaddr4(struct sk_buff *skb, int type, __be32 ipaddr) |
| 408 | 405 | { |
| 409 | − struct nlattr *__nested = ipset_nest_start(skb, type); | |
| 406 | + struct nlattr *__nested = nla_nest_start(skb, type); | |
| 410 | 407 | int ret; |
| 411 | 408 | |
| 412 | 409 | if (!__nested) |
| 413 | 410 | return -EMSGSIZE; |
| 414 | 411 | ret = nla_put_in_addr(skb, IPSET_ATTR_IPADDR_IPV4, ipaddr); |
| 415 | 412 | if (!ret) |
| 416 | − ipset_nest_end(skb, __nested); | |
| 413 | + nla_nest_end(skb, __nested); | |
| 417 | 414 | return ret; |
| 418 | 415 | } |
| 419 | 416 | |
| 420 | 417 | static inline int nla_put_ipaddr6(struct sk_buff *skb, int type, |
| 421 | 418 | const struct in6_addr *ipaddrptr) |
| 422 | 419 | { |
| 423 | − struct nlattr *__nested = ipset_nest_start(skb, type); | |
| 420 | + struct nlattr *__nested = nla_nest_start(skb, type); | |
| 424 | 421 | int ret; |
| 425 | 422 | |
| 426 | 423 | if (!__nested) |
| 427 | 424 | return -EMSGSIZE; |
| 428 | 425 | ret = nla_put_in6_addr(skb, IPSET_ATTR_IPADDR_IPV6, ipaddrptr); |
| 429 | 426 | if (!ret) |
| 430 | − ipset_nest_end(skb, __nested); | |
| 427 | + nla_nest_end(skb, __nested); | |
| 431 | 428 | return ret; |
| 432 | 429 | } |
| 433 | 430 | |