diff options
| -rw-r--r-- | kernel/include/linux/netfilter/ipset/ip_set.h | 6 | ||||
| -rw-r--r-- | netlink.patch | 34 |
2 files changed, 33 insertions, 7 deletions
diff --git a/kernel/include/linux/netfilter/ipset/ip_set.h b/kernel/include/linux/netfilter/ipset/ip_set.h index 7003c78..2d47aa6 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set.h +++ b/kernel/include/linux/netfilter/ipset/ip_set.h @@ -438,12 +438,6 @@ ip_set_get_ipaddr6(struct nlattr *attr[], int type, union nf_inet_addr *ipaddr) #define ipset_nest_start(skb, attr) nla_nest_start(skb, attr | NLA_F_NESTED) #define ipset_nest_end(skb, start) nla_nest_end(skb, start) -#define NLA_PUT_NET32(skb, type, value) \ - NLA_PUT_BE32(skb, type | NLA_F_NET_BYTEORDER, value) - -#define NLA_PUT_NET16(skb, type, value) \ - NLA_PUT_BE16(skb, type | NLA_F_NET_BYTEORDER, value) - #define NLA_PUT_IPADDR4(skb, type, ipaddr) \ do { \ struct nlattr *__nested = ipset_nest_start(skb, type); \ diff --git a/netlink.patch b/netlink.patch index b651d44..faa873b 100644 --- a/netlink.patch +++ b/netlink.patch @@ -1,5 +1,5 @@ diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h -index 9f00da2..9f51ff6 100644 +index 361d6b5..2b11fc1 100644 --- a/include/linux/netfilter/nfnetlink.h +++ b/include/linux/netfilter/nfnetlink.h @@ -47,7 +47,8 @@ struct nfgenmsg { @@ -12,3 +12,35 @@ index 9f00da2..9f51ff6 100644 #ifdef __KERNEL__ +diff --git a/include/net/netlink.h b/include/net/netlink.h +index 373f1a9..8a3906a 100644 +--- a/include/net/netlink.h ++++ b/include/net/netlink.h +@@ -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) + |