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_sgsn.h | |
| parent | 57ae3aa2563252f6f867c6016ed74f57fd54ec3a (diff) | |
| parent | 5a45b156d4165fed159a290c46676d1383ffcc80 (diff) | |
Merge commit 'upstream/0.9.14'
Diffstat (limited to 'include/openbsc/gprs_sgsn.h')
| -rw-r--r-- | include/openbsc/gprs_sgsn.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/openbsc/gprs_sgsn.h b/include/openbsc/gprs_sgsn.h index e641e9918..0fa49a775 100644 --- a/include/openbsc/gprs_sgsn.h +++ b/include/openbsc/gprs_sgsn.h @@ -4,7 +4,7 @@ #include <stdint.h> #include <netinet/in.h> -#include <osmocore/gsm48.h> +#include <osmocom/gsm/gsm48.h> #include <osmocom/crypt/gprs_cipher.h> @@ -103,7 +103,7 @@ struct sgsn_mm_ctx { uint16_t nsei; uint16_t bvci; struct rate_ctr_group *ctrg; - struct timer_list timer; + struct osmo_timer_list timer; unsigned int T; /* Txxxx number */ unsigned int num_T_exp; /* number of consecutive T expirations */ @@ -169,7 +169,7 @@ struct sgsn_pdp_ctx { //uint32_t charging_id; int reordering_reqd; - struct timer_list timer; + struct osmo_timer_list timer; unsigned int T; /* Txxxx number */ unsigned int num_T_exp; /* number of consecutive T expirations */ }; |