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/sgsn.h | |
parent | 57ae3aa2563252f6f867c6016ed74f57fd54ec3a (diff) | |
parent | 5a45b156d4165fed159a290c46676d1383ffcc80 (diff) |
Merge commit 'upstream/0.9.14'
Diffstat (limited to 'include/openbsc/sgsn.h')
-rw-r--r-- | include/openbsc/sgsn.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/openbsc/sgsn.h b/include/openbsc/sgsn.h index 7ca7e1c44..f45b90b13 100644 --- a/include/openbsc/sgsn.h +++ b/include/openbsc/sgsn.h @@ -1,9 +1,8 @@ #ifndef _SGSN_H #define _SGSN_H -#include <sys/types.h> -#include <osmocore/msgb.h> +#include <osmocom/core/msgb.h> #include <openbsc/gprs_ns.h> #include <openbsc/gprs_sgsn.h> @@ -22,11 +21,11 @@ struct sgsn_instance { char *config_file; struct sgsn_config cfg; /* File descriptor wrappers for LibGTP */ - struct bsc_fd gtp_fd0; - struct bsc_fd gtp_fd1c; - struct bsc_fd gtp_fd1u; + struct osmo_fd gtp_fd0; + struct osmo_fd gtp_fd1c; + struct osmo_fd gtp_fd1u; /* Timer for libGTP */ - struct timer_list gtp_timer; + struct osmo_timer_list gtp_timer; /* GSN instance for libgtp */ struct gsn_t *gsn; }; |