Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: ipset: make ip_set_put_flags extern.

ip_set_put_flags is rather large for a static inline function in a
header-file. Move it to ip_set_core.c and export it.

Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Acked-by: Jozsef Kadlecsik <kadlec@netfilter.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Jeremy Sowden and committed by
Pablo Neira Ayuso
85639185 2398a976

+25 -22
+1 -22
include/linux/netfilter/ipset/ip_set.h
··· 276 276 } 277 277 } 278 278 279 - static inline int 280 - ip_set_put_flags(struct sk_buff *skb, struct ip_set *set) 281 - { 282 - u32 cadt_flags = 0; 283 - 284 - if (SET_WITH_TIMEOUT(set)) 285 - if (unlikely(nla_put_net32(skb, IPSET_ATTR_TIMEOUT, 286 - htonl(set->timeout)))) 287 - return -EMSGSIZE; 288 - if (SET_WITH_COUNTER(set)) 289 - cadt_flags |= IPSET_FLAG_WITH_COUNTERS; 290 - if (SET_WITH_COMMENT(set)) 291 - cadt_flags |= IPSET_FLAG_WITH_COMMENT; 292 - if (SET_WITH_SKBINFO(set)) 293 - cadt_flags |= IPSET_FLAG_WITH_SKBINFO; 294 - if (SET_WITH_FORCEADD(set)) 295 - cadt_flags |= IPSET_FLAG_WITH_FORCEADD; 296 - 297 - if (!cadt_flags) 298 - return 0; 299 - return nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(cadt_flags)); 300 - } 279 + int ip_set_put_flags(struct sk_buff *skb, struct ip_set *set); 301 280 302 281 /* Netlink CB args */ 303 282 enum {
+24
net/netfilter/ipset/ip_set_core.c
··· 1418 1418 #define DUMP_TYPE(arg) (((u32)(arg)) & 0x0000FFFF) 1419 1419 #define DUMP_FLAGS(arg) (((u32)(arg)) >> 16) 1420 1420 1421 + int 1422 + ip_set_put_flags(struct sk_buff *skb, struct ip_set *set) 1423 + { 1424 + u32 cadt_flags = 0; 1425 + 1426 + if (SET_WITH_TIMEOUT(set)) 1427 + if (unlikely(nla_put_net32(skb, IPSET_ATTR_TIMEOUT, 1428 + htonl(set->timeout)))) 1429 + return -EMSGSIZE; 1430 + if (SET_WITH_COUNTER(set)) 1431 + cadt_flags |= IPSET_FLAG_WITH_COUNTERS; 1432 + if (SET_WITH_COMMENT(set)) 1433 + cadt_flags |= IPSET_FLAG_WITH_COMMENT; 1434 + if (SET_WITH_SKBINFO(set)) 1435 + cadt_flags |= IPSET_FLAG_WITH_SKBINFO; 1436 + if (SET_WITH_FORCEADD(set)) 1437 + cadt_flags |= IPSET_FLAG_WITH_FORCEADD; 1438 + 1439 + if (!cadt_flags) 1440 + return 0; 1441 + return nla_put_net32(skb, IPSET_ATTR_CADT_FLAGS, htonl(cadt_flags)); 1442 + } 1443 + EXPORT_SYMBOL_GPL(ip_set_put_flags); 1444 + 1421 1445 static int 1422 1446 ip_set_dump_done(struct netlink_callback *cb) 1423 1447 {