diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-11 00:55:28 (GMT) |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-11 00:55:28 (GMT) |
| commit | 84abd88a70090cf00f9e45c3a81680874f17626e (patch) | |
| tree | 4f58b80057f6e1f5817af1dc33a5458b3dfc9a99 /include/linux/netfilter_bridge/ebt_stp.h | |
| parent | 13ca0fcaa33f6b1984c4111b6ec5df42689fea6f (diff) | |
| parent | e28cab42f384745c8a947a9ccd51e4aae52f5d51 (diff) | |
| download | linux-fsl-qoriq-84abd88a70090cf00f9e45c3a81680874f17626e.tar.xz | |
Merge remote branch 'linus/master' into x86/bootmem
Diffstat (limited to 'include/linux/netfilter_bridge/ebt_stp.h')
| -rw-r--r-- | include/linux/netfilter_bridge/ebt_stp.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/netfilter_bridge/ebt_stp.h b/include/linux/netfilter_bridge/ebt_stp.h index e5fd678..e503a0a 100644 --- a/include/linux/netfilter_bridge/ebt_stp.h +++ b/include/linux/netfilter_bridge/ebt_stp.h @@ -20,8 +20,7 @@ #define EBT_STP_MATCH "stp" -struct ebt_stp_config_info -{ +struct ebt_stp_config_info { uint8_t flags; uint16_t root_priol, root_priou; char root_addr[6], root_addrmsk[6]; @@ -35,8 +34,7 @@ struct ebt_stp_config_info uint16_t forward_delayl, forward_delayu; }; -struct ebt_stp_info -{ +struct ebt_stp_info { uint8_t type; struct ebt_stp_config_info config; uint16_t bitmask; |