diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-01-20 00:06:15 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-20 00:06:15 -0800 |
| commit | a07aa004c8d814a975b1a68afdb7baaa8f1b91d5 (patch) | |
| tree | 652edc2dce9732a64780b9e332034b6567631a8b /include/linux/netfilter_bridge/ebt_log.h | |
| parent | net_sched: cleanups (diff) | |
| parent | netfilter: xtables: remove extraneous header that slipped in (diff) | |
| download | linux-dev-a07aa004c8d814a975b1a68afdb7baaa8f1b91d5.tar.xz linux-dev-a07aa004c8d814a975b1a68afdb7baaa8f1b91d5.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
Diffstat (limited to 'include/linux/netfilter_bridge/ebt_log.h')
| -rw-r--r-- | include/linux/netfilter_bridge/ebt_log.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/netfilter_bridge/ebt_log.h b/include/linux/netfilter_bridge/ebt_log.h index cc2cdfb764bc..564beb4946ea 100644 --- a/include/linux/netfilter_bridge/ebt_log.h +++ b/include/linux/netfilter_bridge/ebt_log.h @@ -10,9 +10,9 @@ #define EBT_LOG_WATCHER "log" struct ebt_log_info { - uint8_t loglevel; - uint8_t prefix[EBT_LOG_PREFIX_SIZE]; - uint32_t bitmask; + __u8 loglevel; + __u8 prefix[EBT_LOG_PREFIX_SIZE]; + __u32 bitmask; }; #endif |