From: Philipp Hortmann <philipp.g.hortmann@gmail.com>
To: Tree Davies <tdavies@darkphysics.net>,
gregkh@linuxfoundation.org, anjan@momi.ca, error27@gmail.com
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 05/12] Staging: rtl8192e: Rename function TsInitDelBA
Date: Thu, 13 Jul 2023 23:46:57 +0200 [thread overview]
Message-ID: <dd078125-8287-4d83-a9f7-4acf6435bd18@gmail.com> (raw)
In-Reply-To: <ZK83kk5tQWqdTvXz@basil>
On 7/13/23 01:30, Tree Davies wrote:
> Rename function TsInitDelBA to ts_init_del_ba
> in order to Fix checkpatch warning: Avoid CamelCase
>
> Signed-off-by: Tree Davies <tdavies@darkphysics.net>
> ---
> drivers/staging/rtl8192e/rtl819x_BAProc.c | 2 +-
> drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +-
> drivers/staging/rtl8192e/rtllib.h | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c
> index 2e37f1e949ec..9a32528fe314 100644
> --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c
> +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c
> @@ -484,7 +484,7 @@ void ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *pTS,
> rtllib_send_ADDBAReq(ieee, pTS->TsCommonInfo.Addr, pBA);
> }
>
> -void TsInitDelBA(struct rtllib_device *ieee,
> +void ts_init_del_ba(struct rtllib_device *ieee,
> struct ts_common_info *pTsCommonInfo,
> enum tr_select TxRxSelect)
> {
> diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c
> index 7841d9ce1a7f..8005f7462aca 100644
> --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c
> +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c
> @@ -396,7 +396,7 @@ static void RemoveTsEntry(struct rtllib_device *ieee,
> {
> del_timer_sync(&pTs->SetupTimer);
> del_timer_sync(&pTs->InactTimer);
> - TsInitDelBA(ieee, pTs, TxRxSelect);
> + ts_init_del_ba(ieee, pTs, TxRxSelect);
>
> if (TxRxSelect == RX_DIR) {
> struct rx_reorder_entry *pRxReorderEntry;
> diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
> index de0dd48d0646..42a9b1dafc27 100644
> --- a/drivers/staging/rtl8192e/rtllib.h
> +++ b/drivers/staging/rtl8192e/rtllib.h
> @@ -2010,7 +2010,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb);
> int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb);
> void ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *pTS,
> u8 Policy, u8 bOverwritePending);
> -void TsInitDelBA(struct rtllib_device *ieee,
> +void ts_init_del_ba(struct rtllib_device *ieee,
> struct ts_common_info *pTsCommonInfo,
> enum tr_select TxRxSelect);
> void BaSetupTimeOut(struct timer_list *t);
Hi Tree,
we need to wait which patches are accepted. I cannot apply this patch on
the top of the patches already send and I assume those are accepted. See
below:
kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git apply -v
~/Downloads/20230713-\[PATCH\ 05*
Checking patch drivers/staging/rtl8192e/rtl819x_BAProc.c...
Checking patch drivers/staging/rtl8192e/rtl819x_TSProc.c...
error: while searching for:
{
del_timer_sync(&pTs->SetupTimer);
del_timer_sync(&pTs->InactTimer);
TsInitDelBA(ieee, pTs, TxRxSelect);
if (TxRxSelect == RX_DIR) {
struct rx_reorder_entry *pRxReorderEntry;
error: patch failed: drivers/staging/rtl8192e/rtl819x_TSProc.c:396
error: drivers/staging/rtl8192e/rtl819x_TSProc.c: patch does not apply
Checking patch drivers/staging/rtl8192e/rtllib.h...
Hunk #1 succeeded at 2004 (offset -6 lines).
kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$
So better wait for Greg to choose which ones will be accepted.
Bye Philipp
prev parent reply other threads:[~2023-07-13 21:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-12 23:30 [PATCH 05/12] Staging: rtl8192e: Rename function TsInitDelBA Tree Davies
2023-07-13 21:46 ` Philipp Hortmann [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dd078125-8287-4d83-a9f7-4acf6435bd18@gmail.com \
--to=philipp.g.hortmann@gmail.com \
--cc=anjan@momi.ca \
--cc=error27@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=tdavies@darkphysics.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox