summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-06-12 15:18:15 -0700
committerDavid S. Miller <davem@davemloft.net>2012-06-12 15:18:15 -0700
commit5aa04d3af8916d890836ccaa9d146edee1e4c655 (patch)
treedfb3c8dc5f8f838a4497d1442b8945c30456647e /include
parente3d62d7e8e05a6a4b08f4672385ae58fc0f132c4 (diff)
parentd109e9af61a6d2fdf33dc615ab8b724a8e75a8a4 (diff)
downloadlinux-3.10-5aa04d3af8916d890836ccaa9d146edee1e4c655.tar.gz
linux-3.10-5aa04d3af8916d890836ccaa9d146edee1e4c655.tar.bz2
linux-3.10-5aa04d3af8916d890836ccaa9d146edee1e4c655.zip
Merge branch 'master' of git://1984.lsi.us.es/net
Diffstat (limited to 'include')
-rw-r--r--include/linux/netfilter/xt_HMARK.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/netfilter/xt_HMARK.h b/include/linux/netfilter/xt_HMARK.h
index abb1650940d..826fc580757 100644
--- a/include/linux/netfilter/xt_HMARK.h
+++ b/include/linux/netfilter/xt_HMARK.h
@@ -27,7 +27,12 @@ union hmark_ports {
__u16 src;
__u16 dst;
} p16;
+ struct {
+ __be16 src;
+ __be16 dst;
+ } b16;
__u32 v32;
+ __be32 b32;
};
struct xt_hmark_info {