Commit f703651e authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik Committed by Patrick McHardy
Browse files

netfilter: NFNL_SUBSYS_IPSET id and NLA_PUT_NET* macros 



The patch adds the NFNL_SUBSYS_IPSET id and NLA_PUT_NET* macros to the
vanilla kernel.

Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 6a4ddef2

include/linux/netfilter/nfnetlink.h

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ struct nfgenmsg { 
#define NFNL_SUBSYS_QUEUE		3

#define NFNL_SUBSYS_ULOG		4

#define NFNL_SUBSYS_OSF			5

#define NFNL_SUBSYS_COUNT		6

#define NFNL_SUBSYS_IPSET		6

#define NFNL_SUBSYS_COUNT		7



#ifdef __KERNEL__

include/net/netlink.h

+9 −0
Original line number Diff line number Diff line
@@ -856,18 +856,27 @@ static inline int nla_put_msecs(struct sk_buff *skb, int attrtype, 
#define NLA_PUT_BE16(skb, attrtype, value) \

	NLA_PUT_TYPE(skb, __be16, attrtype, value)



#define NLA_PUT_NET16(skb, attrtype, value) \

	NLA_PUT_BE16(skb, attrtype | NLA_F_NET_BYTEORDER, value)



#define NLA_PUT_U32(skb, attrtype, value) \

	NLA_PUT_TYPE(skb, u32, attrtype, value)



#define NLA_PUT_BE32(skb, attrtype, value) \

	NLA_PUT_TYPE(skb, __be32, attrtype, value)



#define NLA_PUT_NET32(skb, attrtype, value) \

	NLA_PUT_BE32(skb, attrtype | NLA_F_NET_BYTEORDER, value)



#define NLA_PUT_U64(skb, attrtype, value) \

	NLA_PUT_TYPE(skb, u64, attrtype, value)



#define NLA_PUT_BE64(skb, attrtype, value) \

	NLA_PUT_TYPE(skb, __be64, attrtype, value)



#define NLA_PUT_NET64(skb, attrtype, value) \

	NLA_PUT_BE64(skb, attrtype | NLA_F_NET_BYTEORDER, value)



#define NLA_PUT_STRING(skb, attrtype, value) \

	NLA_PUT(skb, attrtype, strlen(value) + 1, value)