diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-11-08 15:52:08 +0900 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-11-14 00:08:51 +0900 |
| commit | c85e89961a4e9dd6fd0b75ce17e9c948c360e4a1 (patch) | |
| tree | 8145bbc9cebc1cec34a256575cdd7685ede5fcd0 | |
| parent | 2fc2bc6bc40e7460a3ceb67c1774fd3f39e27860 (diff) | |
gtp-kernel: Avoid global state variable
Whether or not GTP kernel support is enabled is the property of a
given APN, and not a global state variable.
Change-Id: Iff3bd8a52bd6c20f9811ee41ff700486d08591f3
| -rw-r--r-- | ggsn/gtp-kernel.c | 16 | ||||
| -rw-r--r-- | ggsn/gtp-kernel.h | 7 |
2 files changed, 0 insertions, 23 deletions
diff --git a/ggsn/gtp-kernel.c b/ggsn/gtp-kernel.c index 102f0f7..e1553bd 100644 --- a/ggsn/gtp-kernel.c +++ b/ggsn/gtp-kernel.c @@ -51,7 +51,6 @@ static void pdp_debug(struct pdp_t *pdp) static struct { int genl_id; struct mnl_socket *nl; - bool enabled; } gtp_nl; int gtp_kernel_init(struct gsn_t *gsn, const char *devname, struct in46_prefix *prefix, const char *ipup) @@ -72,7 +71,6 @@ int gtp_kernel_init(struct gsn_t *gsn, const char *devname, struct in46_prefix * strerror(errno)); return -1; } - gtp_nl.enabled = true; gtp_nl.nl = genl_socket_open(); if (gtp_nl.nl == NULL) { @@ -126,9 +124,6 @@ int gtp_kernel_init(struct gsn_t *gsn, const char *devname, struct in46_prefix * void gtp_kernel_stop(const char *devname) { - if (!gtp_nl.enabled) - return; - gtp_dev_destroy(devname); } @@ -138,9 +133,6 @@ int gtp_kernel_tunnel_add(struct pdp_t *pdp, const char *devname) struct gtp_tunnel *t; int ret; - if (!gtp_nl.enabled) - return 0; - pdp_debug(pdp); t = gtp_tunnel_alloc(); @@ -175,9 +167,6 @@ int gtp_kernel_tunnel_del(struct pdp_t *pdp, const char *devname) struct gtp_tunnel *t; int ret; - if (!gtp_nl.enabled) - return 0; - pdp_debug(pdp); t = gtp_tunnel_alloc(); @@ -198,8 +187,3 @@ int gtp_kernel_tunnel_del(struct pdp_t *pdp, const char *devname) return ret; } - -int gtp_kernel_enabled(void) -{ - return gtp_nl.enabled; -} diff --git a/ggsn/gtp-kernel.h b/ggsn/gtp-kernel.h index 62a0cd2..e2da55a 100644 --- a/ggsn/gtp-kernel.h +++ b/ggsn/gtp-kernel.h @@ -13,8 +13,6 @@ void gtp_kernel_stop(const char *devname); int gtp_kernel_tunnel_add(struct pdp_t *pdp, const char *devname); int gtp_kernel_tunnel_del(struct pdp_t *pdp, const char *devname); -int gtp_kernel_enabled(void); - #else static inline int gtp_kernel_init(struct gsn_t *gsn, const char *devname, struct in46_prefix *prefix, const char *ipup) { @@ -34,10 +32,5 @@ static inline int gtp_kernel_tunnel_del(struct pdp_t *pdp, const char *devname) return 0; } -static inline int gtp_kernel_enabled(void) -{ - return 0; -} - #endif #endif /* _GTP_KERNEL_H_ */ |