Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 837a90ea authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik
Browse files

netfilter: ipset: Regroup ip_set_put_extensions and add extern 



Cleanup: group ip_set_put_extensions and ip_set_get_extensions
together and add missing extern.

Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent 722a9451

include/linux/netfilter/ipset/ip_set.h

+2 −4
Original line number Original line Diff line number Diff line
@@ -331,6 +331,8 @@ extern size_t ip_set_elem_len(struct ip_set *set, struct nlattr *tb[], 
			      size_t len, size_t align);

			      size_t len, size_t align);

extern int ip_set_get_extensions(struct ip_set *set, struct nlattr *tb[],

extern int ip_set_get_extensions(struct ip_set *set, struct nlattr *tb[],

				 struct ip_set_ext *ext);

				 struct ip_set_ext *ext);

extern int ip_set_put_extensions(struct sk_buff *skb, const struct ip_set *set,

				 const void *e, bool active);





static inline int

static inline int

ip_set_get_hostipaddr4(struct nlattr *nla, u32 *ipaddr)

ip_set_get_hostipaddr4(struct nlattr *nla, u32 *ipaddr)
@@ -449,10 +451,6 @@ bitmap_bytes(u32 a, u32 b) 
#include <linux/netfilter/ipset/ip_set_counter.h>

#include <linux/netfilter/ipset/ip_set_counter.h>

#include <linux/netfilter/ipset/ip_set_skbinfo.h>

#include <linux/netfilter/ipset/ip_set_skbinfo.h>





int

ip_set_put_extensions(struct sk_buff *skb, const struct ip_set *set,

		      const void *e, bool active);



#define IP_SET_INIT_KEXT(skb, opt, set)			\

#define IP_SET_INIT_KEXT(skb, opt, set)			\

	{ .bytes = (skb)->len, .packets = 1,		\

	{ .bytes = (skb)->len, .packets = 1,		\

	  .timeout = ip_set_adt_opt_timeout(opt, set) }

	  .timeout = ip_set_adt_opt_timeout(opt, set) }