diff options
author | Patrick McHardy | 2011-01-18 16:20:53 +0100 |
---|---|---|
committer | Patrick McHardy | 2011-01-18 16:20:53 +0100 |
commit | a8fc0d9b3401cb5e42a437293db383998290157d (patch) | |
tree | 10f8af504eba587c22c380ec0b5ab538dc314a50 /include/linux/netfilter_bridge/ebt_arp.h | |
parent | netfilter: allow NFQUEUE bypass if no listener is available (diff) | |
parent | netfilter: xtables: add missing header files to export list (diff) | |
download | kernel-qcow2-linux-a8fc0d9b3401cb5e42a437293db383998290157d.tar.gz kernel-qcow2-linux-a8fc0d9b3401cb5e42a437293db383998290157d.tar.xz kernel-qcow2-linux-a8fc0d9b3401cb5e42a437293db383998290157d.zip |
Merge branch 'master' of git://dev.medozas.de/linux
Diffstat (limited to 'include/linux/netfilter_bridge/ebt_arp.h')
-rw-r--r-- | include/linux/netfilter_bridge/ebt_arp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netfilter_bridge/ebt_arp.h b/include/linux/netfilter_bridge/ebt_arp.h index cbf4843b6b0f..e62b5af95869 100644 --- a/include/linux/netfilter_bridge/ebt_arp.h +++ b/include/linux/netfilter_bridge/ebt_arp.h @@ -27,8 +27,8 @@ struct ebt_arp_info unsigned char smmsk[ETH_ALEN]; unsigned char dmaddr[ETH_ALEN]; unsigned char dmmsk[ETH_ALEN]; - uint8_t bitmask; - uint8_t invflags; + __u8 bitmask; + __u8 invflags; }; #endif |