Commit 9ca399c5 authored by Chas Williams's avatar Chas Williams Committed by Stephen Hemminger

[ATM]: If CLIP is not enabled, try_atm_clp_ops() should always fail.

parent 6b9c2957
...@@ -67,7 +67,15 @@ struct atm_clip_ops { ...@@ -67,7 +67,15 @@ struct atm_clip_ops {
}; };
void atm_clip_ops_set(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); 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 neigh_table *clip_tbl_hook;
extern struct atm_clip_ops *atm_clip_ops; extern struct atm_clip_ops *atm_clip_ops;
......
...@@ -32,10 +32,8 @@ ...@@ -32,10 +32,8 @@
#include "common.h" /* atm_proc_init prototype */ #include "common.h" /* atm_proc_init prototype */
#include "signaling.h" /* to get sigd - ugly too */ #include "signaling.h" /* to get sigd - ugly too */
#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)
#include <net/atmclip.h> #include <net/atmclip.h>
#include "ipcommon.h" #include "ipcommon.h"
#endif
#if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE) #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
#include "lec.h" #include "lec.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment