diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-15 04:29:06 -0500 |
| commit | 709334c87dbdb44150ce436b3d13c814db0dcae9 (patch) | |
| tree | 5861a45f70c1f283720337abd864498f5afb3dbe /include/linux/if_bridge.h | |
| parent | 0d64b568fcd48b133721c1d322e7c51d85eb12df (diff) | |
| parent | f74890277a196949e4004fe2955e1d4fb3930f98 (diff) | |
Merge branch 'fixes' of git://git.alsa-project.org/alsa-kernel into for-linus
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 6badb3e2c4e4..938b7e81df95 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h | |||
| @@ -49,8 +49,7 @@ | |||
| 49 | #define BR_STATE_FORWARDING 3 | 49 | #define BR_STATE_FORWARDING 3 |
| 50 | #define BR_STATE_BLOCKING 4 | 50 | #define BR_STATE_BLOCKING 4 |
| 51 | 51 | ||
| 52 | struct __bridge_info | 52 | struct __bridge_info { |
| 53 | { | ||
| 54 | __u64 designated_root; | 53 | __u64 designated_root; |
| 55 | __u64 bridge_id; | 54 | __u64 bridge_id; |
| 56 | __u32 root_path_cost; | 55 | __u32 root_path_cost; |
| @@ -72,8 +71,7 @@ struct __bridge_info | |||
| 72 | __u32 gc_timer_value; | 71 | __u32 gc_timer_value; |
| 73 | }; | 72 | }; |
| 74 | 73 | ||
| 75 | struct __port_info | 74 | struct __port_info { |
| 76 | { | ||
| 77 | __u64 designated_root; | 75 | __u64 designated_root; |
| 78 | __u64 designated_bridge; | 76 | __u64 designated_bridge; |
| 79 | __u16 port_id; | 77 | __u16 port_id; |
| @@ -89,8 +87,7 @@ struct __port_info | |||
| 89 | __u32 hold_timer_value; | 87 | __u32 hold_timer_value; |
| 90 | }; | 88 | }; |
| 91 | 89 | ||
| 92 | struct __fdb_entry | 90 | struct __fdb_entry { |
| 93 | { | ||
| 94 | __u8 mac_addr[6]; | 91 | __u8 mac_addr[6]; |
| 95 | __u8 port_no; | 92 | __u8 port_no; |
| 96 | __u8 is_local; | 93 | __u8 is_local; |
