Merge branch 'master' of git://1984.lsi.us.es/net

This commit is contained in:
David S. Miller 2012-06-12 15:18:15 -07:00
commit 5aa04d3af8
3 changed files with 48 additions and 34 deletions

View file

@ -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 {