diff options
Diffstat (limited to 'net/bridge/br_private.h')
-rw-r--r-- | net/bridge/br_private.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index e330b17b6d81..8f10e09f251b 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h | |||
@@ -68,7 +68,6 @@ struct net_bridge_port | |||
68 | /* STP */ | 68 | /* STP */ |
69 | u8 priority; | 69 | u8 priority; |
70 | u8 state; | 70 | u8 state; |
71 | u8 deleted; | ||
72 | u16 port_no; | 71 | u16 port_no; |
73 | unsigned char topology_change_ack; | 72 | unsigned char topology_change_ack; |
74 | unsigned char config_pending; | 73 | unsigned char config_pending; |
@@ -233,9 +232,8 @@ extern void (*br_fdb_put_hook)(struct net_bridge_fdb_entry *ent); | |||
233 | 232 | ||
234 | #ifdef CONFIG_SYSFS | 233 | #ifdef CONFIG_SYSFS |
235 | /* br_sysfs_if.c */ | 234 | /* br_sysfs_if.c */ |
235 | extern struct sysfs_ops brport_sysfs_ops; | ||
236 | extern int br_sysfs_addif(struct net_bridge_port *p); | 236 | extern int br_sysfs_addif(struct net_bridge_port *p); |
237 | extern void br_sysfs_removeif(struct net_bridge_port *p); | ||
238 | extern void br_sysfs_freeif(struct net_bridge_port *p); | ||
239 | 237 | ||
240 | /* br_sysfs_br.c */ | 238 | /* br_sysfs_br.c */ |
241 | extern int br_sysfs_addbr(struct net_device *dev); | 239 | extern int br_sysfs_addbr(struct net_device *dev); |
@@ -244,8 +242,6 @@ extern void br_sysfs_delbr(struct net_device *dev); | |||
244 | #else | 242 | #else |
245 | 243 | ||
246 | #define br_sysfs_addif(p) (0) | 244 | #define br_sysfs_addif(p) (0) |
247 | #define br_sysfs_removeif(p) do { } while(0) | ||
248 | #define br_sysfs_freeif(p) kfree(p) | ||
249 | #define br_sysfs_addbr(dev) (0) | 245 | #define br_sysfs_addbr(dev) (0) |
250 | #define br_sysfs_delbr(dev) do { } while(0) | 246 | #define br_sysfs_delbr(dev) do { } while(0) |
251 | #endif /* CONFIG_SYSFS */ | 247 | #endif /* CONFIG_SYSFS */ |