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/if_bridge.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/if_bridge.h')
| -rw-r--r-- | include/linux/if_bridge.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index 6badb3e..938b7e8 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -49,8 +49,7 @@ #define BR_STATE_FORWARDING 3 #define BR_STATE_BLOCKING 4 -struct __bridge_info -{ +struct __bridge_info { __u64 designated_root; __u64 bridge_id; __u32 root_path_cost; @@ -72,8 +71,7 @@ struct __bridge_info __u32 gc_timer_value; }; -struct __port_info -{ +struct __port_info { __u64 designated_root; __u64 designated_bridge; __u16 port_id; @@ -89,8 +87,7 @@ struct __port_info __u32 hold_timer_value; }; -struct __fdb_entry -{ +struct __fdb_entry { __u8 mac_addr[6]; __u8 port_no; __u8 is_local; |