From patchwork Fri May 30 15:57:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Willmann X-Patchwork-Id: 354247 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ganesha.gnumonks.org (ganesha.gnumonks.org [IPv6:2001:780:45:1d:225:90ff:fe52:c662]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5A8A61400CF for ; Sat, 31 May 2014 02:07:22 +1000 (EST) Received: from localhost ([127.0.0.1] helo=ganesha.gnumonks.org) by ganesha.gnumonks.org with esmtp (Exim 4.72) (envelope-from ) id 1WqPKm-0000MO-N1; Fri, 30 May 2014 18:07:08 +0200 Received: from isonoe.totalueberwachung.de ([2a01:198:210:100::1]) by ganesha.gnumonks.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1WqPCD-0007kx-MX; Fri, 30 May 2014 17:58:19 +0200 Received: from adrastea.totalueberwachung.de (24-134-58-61-dynip.superkabel.de [24.134.58.61]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by isonoe.totalueberwachung.de (Postfix) with ESMTPSA id 4555F60058; Fri, 30 May 2014 17:58:17 +0200 (CEST) Received: by adrastea.totalueberwachung.de (Postfix, from userid 1000) id 87B90220D7; Fri, 30 May 2014 17:58:15 +0200 (CEST) From: Daniel Willmann To: OpenBSC Mailing List , Osmocom net ML Subject: [osmo-pcu 1/3] tbf/bts: Rename tbf->snd_dl_ack to tbf->rcvd_dl_ack Date: Fri, 30 May 2014 17:57:59 +0200 Message-Id: <8d1337120f7cc17da78c0a0496e6d02a94907a38.1401463598.git.daniel@totalueberwachung.de> X-Mailer: git-send-email 1.8.4.2 In-Reply-To: <1401465481-28566-1-git-send-email-dwillmann@sysmocom.de> References: <1401465481-28566-1-git-send-email-dwillmann@sysmocom.de> X-Spam-Score: -0.0 (/) Cc: Daniel Willmann X-BeenThere: openbsc@lists.osmocom.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Development of the OpenBSC GSM base station controller List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openbsc-bounces@lists.osmocom.org Errors-To: openbsc-bounces@lists.osmocom.org This function is called to act upon a received DL ACK packet so this name makes more sense. --- src/bts.cpp | 2 +- src/tbf.cpp | 2 +- src/tbf.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bts.cpp b/src/bts.cpp index ff16e29..6c02408 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -805,7 +805,7 @@ void gprs_rlcmac_pdch::rcv_control_dl_ack_nack(Packet_Downlink_Ack_Nack_t *ack_n LOGP(DRLCMAC, LOGL_DEBUG, "RX: [PCU <- BTS] %s Packet Downlink Ack/Nack\n", tbf_name(tbf)); tbf->poll_state = GPRS_RLCMAC_POLL_NONE; - rc = tbf->snd_dl_ack( + rc = tbf->rcvd_dl_ack( ack_nack->Ack_Nack_Description.FINAL_ACK_INDICATION, ack_nack->Ack_Nack_Description.STARTING_SEQUENCE_NUMBER, ack_nack->Ack_Nack_Description.RECEIVED_BLOCK_BITMAP); diff --git a/src/tbf.cpp b/src/tbf.cpp index d6b3802..b20d0fc 100644 --- a/src/tbf.cpp +++ b/src/tbf.cpp @@ -1425,7 +1425,7 @@ int gprs_rlcmac_tbf::maybe_start_new_window() return 0; } -int gprs_rlcmac_tbf::snd_dl_ack(uint8_t final_ack, uint8_t ssn, uint8_t *rbb) +int gprs_rlcmac_tbf::rcvd_dl_ack(uint8_t final_ack, uint8_t ssn, uint8_t *rbb) { LOGP(DRLCMACDL, LOGL_DEBUG, "%s downlink acknowledge\n", tbf_name(this)); diff --git a/src/tbf.h b/src/tbf.h index c301960..24b98d2 100644 --- a/src/tbf.h +++ b/src/tbf.h @@ -103,7 +103,7 @@ struct gprs_rlcmac_tbf { struct msgb *create_dl_ass(uint32_t fn); struct msgb *create_ul_ass(uint32_t fn); struct msgb *create_ul_ack(uint32_t fn); - int snd_dl_ack(uint8_t final, uint8_t ssn, uint8_t *rbb); + int rcvd_dl_ack(uint8_t final, uint8_t ssn, uint8_t *rbb); int snd_ul_ud(); /* blocks were acked */