diff options
| author |   Stephen Hemminger <shemminger@osdl.org> | 2006-02-09 17:10:12 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2006-02-09 17:10:12 -0800 |
| commit | bab1deea308afcf9200837d6ac20aefe92972efb (patch) | |
| tree | bcf3d6ecb431b7b94cdd2a68e12b97abe3c2ebba /net/bridge/br_private.h | |
| parent | [BRIDGE]: netfilter handle RCU during removal (diff) | |
| download | linux-dev-bab1deea308afcf9200837d6ac20aefe92972efb.tar.xz linux-dev-bab1deea308afcf9200837d6ac20aefe92972efb.zip | |
[BRIDGE]: fix error handling for add interface to bridge
Refactor how the bridge code interacts with kobject system.
It should still use kobjects even if not using sysfs.
Fix the error unwind handling in br_add_if.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_private.h')
| -rw-r--r-- | net/bridge/br_private.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index c5bd631ffcd5..8f10e09f251b 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -232,9 +232,8 @@ extern void (*br_fdb_put_hook)(struct net_bridge_fdb_entry *ent); #ifdef CONFIG_SYSFS /* br_sysfs_if.c */ +extern struct sysfs_ops brport_sysfs_ops; extern int br_sysfs_addif(struct net_bridge_port *p); -extern void br_sysfs_removeif(struct net_bridge_port *p); -extern void br_sysfs_freeif(struct net_bridge_port *p); /* br_sysfs_br.c */ extern int br_sysfs_addbr(struct net_device *dev); @@ -243,8 +242,6 @@ extern void br_sysfs_delbr(struct net_device *dev); #else #define br_sysfs_addif(p) (0) -#define br_sysfs_removeif(p) do { } while(0) -#define br_sysfs_freeif(p) kfree(p) #define br_sysfs_addbr(dev) (0) #define br_sysfs_delbr(dev) do { } while(0) #endif /* CONFIG_SYSFS */ |