summaryrefslogtreecommitdiffstats
path: root/netlink.patch
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-01-20 10:39:01 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-01-20 10:39:01 +0100
commit0bd2dd6f87f802af37bf037aa084ec4bd9280fae (patch)
tree85c2c5a794810b1d392074244f24e3097cd00272 /netlink.patch
parentcfb2375a3a0d018b1f3dac518126e0dff9191e78 (diff)
Move NLA_PUT_NET* macros to include/net/netlink.h
These macros can be useful in general (Patrick McHardy's review)
Diffstat (limited to 'netlink.patch')
-rw-r--r--netlink.patch34
1 files changed, 33 insertions, 1 deletions
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)
+