projects / packages / kernel.git / blame
| Commit | Line | Data |
|---|---|---|
| 08dbc58f SZ |
1 | --- linux/net/wanrouter/af_wanpipe.c Fri Feb 23 17:55:55 2001 |
| 2 | +++ linux/net/wanrouter/af_wanpipe.c.sz Fri Feb 23 17:58:06 2001 | |
| 3 | @@ -64,9 +64,7 @@ | |
| 4 | #include <net/inet_common.h> | |
| 5 | #endif | |
| 6 | ||
| 7 | -#ifdef CONFIG_BRIDGE | |
| 8 | -#include <net/br.h> | |
| 9 | -#endif | |
| 10 | +#include <linux/if_bridge.h> | |
| 11 | ||
| 12 | #define SLOW_BACKOFF 0.1*HZ | |
| 13 | #define FAST_BACKOFF 0.01*HZ | |
| 14 | @@ -1697,11 +1695,14 @@ | |
| 15 | ||
| 16 | case SIOCGIFBR: | |
| 17 | case SIOCSIFBR: | |
| 18 | -#ifdef CONFIG_BRIDGE | |
| 19 | - return(br_ioctl(cmd,(void *) arg)); | |
| 20 | -#else | |
| 21 | +#ifdef CONFIG_KMOD | |
| 22 | + if (br_ioctl_hook == NULL) | |
| 23 | + request_module("bride"); | |
| 24 | +#endif | |
| 25 | + if (br_ioctl_hook != NULL) | |
| 26 | + return br_ioctl_hook(arg); | |
| 27 | + | |
| 28 | return -ENOPKG; | |
| 29 | -#endif | |
| 30 | ||
| 31 | #ifdef CONFIG_INET | |
| 32 | case SIOCADDRT: |