diff options
| author | Jonathan Santos <jrsantos@jonathanrsantos.com> | 2011-08-17 15:34:52 -0400 |
|---|---|---|
| committer | Jonathan Santos <jrsantos@jonathanrsantos.com> | 2011-08-17 15:34:52 -0400 |
| commit | 3688ffd53669cdcb7975fd879ed92fceaf7d5572 (patch) | |
| tree | c40e568bfd82527aca63d200fd87369fcb1044c7 /include/openbsc/gprs_ns.h | |
| parent | 57ae3aa2563252f6f867c6016ed74f57fd54ec3a (diff) | |
| parent | 5a45b156d4165fed159a290c46676d1383ffcc80 (diff) | |
Merge commit 'upstream/0.9.14'
Diffstat (limited to 'include/openbsc/gprs_ns.h')
| -rw-r--r-- | include/openbsc/gprs_ns.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/openbsc/gprs_ns.h b/include/openbsc/gprs_ns.h index 953c364b8..8f28d4623 100644 --- a/include/openbsc/gprs_ns.h +++ b/include/openbsc/gprs_ns.h @@ -77,10 +77,10 @@ enum ns_cause { /* Our Implementation */ #include <netinet/in.h> -#include <osmocore/linuxlist.h> -#include <osmocore/msgb.h> -#include <osmocore/timer.h> -#include <osmocore/select.h> +#include <osmocom/core/linuxlist.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/timer.h> +#include <osmocom/core/select.h> #define NS_TIMERS_COUNT 7 #define NS_TIMERS "(tns-block|tns-block-retries|tns-reset|tns-reset-retries|tns-test|tns-alive|tns-alive-retries)" @@ -133,13 +133,13 @@ struct gprs_ns_inst { /* NS-over-IP specific bits */ struct { - struct bsc_fd fd; + struct osmo_fd fd; uint32_t local_ip; uint16_t local_port; } nsip; /* NS-over-FR-over-GRE-over-IP specific bits */ struct { - struct bsc_fd fd; + struct osmo_fd fd; uint32_t local_ip; int enabled:1; } frgre; @@ -163,7 +163,7 @@ struct gprs_nsvc { uint32_t state; uint32_t remote_state; - struct timer_list timer; + struct osmo_timer_list timer; enum nsvc_timer_mode timer_mode; int alive_retries; |