diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-05-23 21:18:01 +0800 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-05-23 21:18:01 +0800 |
commit | 5617d99388508dbb041c1af65a175cf2244e94bd (patch) | |
tree | 3a0299b3b195c5726f306ccdc072973d44a4d2bb /openbsc/src/gprs/gprs_ns.c | |
parent | d30cefaac153377f55c57be31463633a233bb2b6 (diff) |
gprs: Fix warnings on funny casts for the return statement
Change gprs_nsvc_reset to return void instead of a int
as the gb_proxy.c currently ignores the reutnr value anyway.
Change the caller inside gprs_ns to return the newly allocated
nsvc instead of the return of gprs_nsvc_reset.
Diffstat (limited to 'openbsc/src/gprs/gprs_ns.c')
-rw-r--r-- | openbsc/src/gprs/gprs_ns.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/openbsc/src/gprs/gprs_ns.c b/openbsc/src/gprs/gprs_ns.c index 04d17b8e..467e43ac 100644 --- a/openbsc/src/gprs/gprs_ns.c +++ b/openbsc/src/gprs/gprs_ns.c @@ -924,7 +924,7 @@ int gprs_ns_nsip_listen(struct gprs_ns_inst *nsi) } /* Initiate a RESET procedure */ -int gprs_nsvc_reset(struct gprs_nsvc *nsvc, uint8_t cause) +void gprs_nsvc_reset(struct gprs_nsvc *nsvc, uint8_t cause) { /* Mark NS-VC locally as blocked and dead */ nsvc->state = NSE_S_BLOCKED; @@ -935,8 +935,6 @@ int gprs_nsvc_reset(struct gprs_nsvc *nsvc, uint8_t cause) } /* Start Tns-reset */ nsvc_start_timer(nsvc, NSVC_TIMER_TNS_RESET); - - return nsvc; } /* Establish a connection (from the BSS) to the SGSN */ @@ -954,5 +952,6 @@ struct gprs_nsvc *nsip_connect(struct gprs_ns_inst *nsi, nsvc->nsvci = nsvci; nsvc->remote_end_is_sgsn = 1; - return gprs_nsvc_reset(nsvc, NS_CAUSE_OM_INTERVENTION); + gprs_nsvc_reset(nsvc, NS_CAUSE_OM_INTERVENTION); + return nsvc; } |