diff options
| author | Chas Williams <chas@cmf.nrl.navy.mil> | 2003-09-22 22:39:35 -0700 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@osdl.org> | 2003-09-22 22:39:35 -0700 |
| commit | 9ca399c5774ffa81dfe45d722cc3daa6be4a9529 (patch) | |
| tree | 8b2f1f3fc1e6e2a447bc8b466b85947ed9fc56d0 | |
| parent | 6b9c2957dc873eb9218230539423e61083cdf9b5 (diff) | |
[ATM]: If CLIP is not enabled, try_atm_clp_ops() should always fail.
| -rw-r--r-- | include/net/atmclip.h | 8 | ||||
| -rw-r--r-- | net/atm/proc.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/include/net/atmclip.h b/include/net/atmclip.h index fdbbb71cdb0e..a9ec5e4fed66 100644 --- a/include/net/atmclip.h +++ b/include/net/atmclip.h @@ -67,7 +67,15 @@ struct atm_clip_ops { }; void atm_clip_ops_set(struct atm_clip_ops *); +#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE) int try_atm_clip_ops(void); +#else +static inline int try_atm_clip_ops(void) +{ + return 0; +} +#endif + extern struct neigh_table *clip_tbl_hook; extern struct atm_clip_ops *atm_clip_ops; diff --git a/net/atm/proc.c b/net/atm/proc.c index 6c2f37a73209..62810f5ea86d 100644 --- a/net/atm/proc.c +++ b/net/atm/proc.c @@ -32,10 +32,8 @@ #include "common.h" /* atm_proc_init prototype */ #include "signaling.h" /* to get sigd - ugly too */ -#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE) #include <net/atmclip.h> #include "ipcommon.h" -#endif #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE) #include "lec.h" |