diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2006-05-25 15:59:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-06-17 21:26:12 -0700 |
| commit | c090971326db094ed702c1f8f2dbe04b7e3b8f27 (patch) | |
| tree | 9c964fc79298455eb4b45981a34a6117175ff846 /net/bridge/br_private.h | |
| parent | 9ef513bed68534110727381ab652f06756803f5a (diff) | |
| download | blackbird-op-linux-c090971326db094ed702c1f8f2dbe04b7e3b8f27.tar.gz blackbird-op-linux-c090971326db094ed702c1f8f2dbe04b7e3b8f27.zip | |
[BRIDGE]: fix module startup error handling
Return address in use, if some other kernel code has the SAP.
Propogate out error codes from netfilter registration and unwind.
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, 5 insertions, 0 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 86ecea7ed372..22071d156828 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -192,8 +192,13 @@ extern int br_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); extern int br_ioctl_deviceless_stub(unsigned int cmd, void __user *arg); /* br_netfilter.c */ +#ifdef CONFIG_BRIDGE_NETFILTER extern int br_netfilter_init(void); extern void br_netfilter_fini(void); +#else +#define br_netfilter_init() (0) +#define br_netfilter_fini() do { } while(0) +#endif /* br_stp.c */ extern void br_log_state(const struct net_bridge_port *p); |
