diff options
Diffstat (limited to 'net/bridge/br_private.h')
-rw-r--r-- | net/bridge/br_private.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 1ae6395a0369..f4ae87b5aa6e 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h | |||
@@ -88,6 +88,7 @@ struct net_bridge_fdb_entry | |||
88 | mac_addr addr; | 88 | mac_addr addr; |
89 | unsigned char is_local; | 89 | unsigned char is_local; |
90 | unsigned char is_static; | 90 | unsigned char is_static; |
91 | __u16 vlan_id; | ||
91 | }; | 92 | }; |
92 | 93 | ||
93 | struct net_bridge_port_group { | 94 | struct net_bridge_port_group { |
@@ -373,7 +374,8 @@ extern void br_fdb_cleanup(unsigned long arg); | |||
373 | extern void br_fdb_delete_by_port(struct net_bridge *br, | 374 | extern void br_fdb_delete_by_port(struct net_bridge *br, |
374 | const struct net_bridge_port *p, int do_all); | 375 | const struct net_bridge_port *p, int do_all); |
375 | extern struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br, | 376 | extern struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br, |
376 | const unsigned char *addr); | 377 | const unsigned char *addr, |
378 | __u16 vid); | ||
377 | extern int br_fdb_test_addr(struct net_device *dev, unsigned char *addr); | 379 | extern int br_fdb_test_addr(struct net_device *dev, unsigned char *addr); |
378 | extern int br_fdb_fillbuf(struct net_bridge *br, void *buf, | 380 | extern int br_fdb_fillbuf(struct net_bridge *br, void *buf, |
379 | unsigned long count, unsigned long off); | 381 | unsigned long count, unsigned long off); |
@@ -382,7 +384,8 @@ extern int br_fdb_insert(struct net_bridge *br, | |||
382 | const unsigned char *addr); | 384 | const unsigned char *addr); |
383 | extern void br_fdb_update(struct net_bridge *br, | 385 | extern void br_fdb_update(struct net_bridge *br, |
384 | struct net_bridge_port *source, | 386 | struct net_bridge_port *source, |
385 | const unsigned char *addr); | 387 | const unsigned char *addr, |
388 | u16 vid); | ||
386 | 389 | ||
387 | extern int br_fdb_delete(struct ndmsg *ndm, | 390 | extern int br_fdb_delete(struct ndmsg *ndm, |
388 | struct net_device *dev, | 391 | struct net_device *dev, |