diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/linux/if_bridge.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/if_bridge.h')
| -rw-r--r-- | include/linux/if_bridge.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index 58e43e566457..950e13d09e06 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h | |||
| @@ -97,7 +97,9 @@ struct __fdb_entry | |||
| 97 | __u8 port_no; | 97 | __u8 port_no; |
| 98 | __u8 is_local; | 98 | __u8 is_local; |
| 99 | __u32 ageing_timer_value; | 99 | __u32 ageing_timer_value; |
| 100 | __u32 unused; | 100 | __u8 port_hi; |
| 101 | __u8 pad0; | ||
| 102 | __u16 unused; | ||
| 101 | }; | 103 | }; |
| 102 | 104 | ||
| 103 | #ifdef __KERNEL__ | 105 | #ifdef __KERNEL__ |