Messages in this thread | | | Date | Thu, 6 Jul 2023 22:48:56 +0200 | Subject | Re: [PATCH] staging: rtl8192e: Rename variable bCurrentHTSupport | From | Philipp Hortmann <> |
| |
On 7/6/23 03:59, Tree Davies wrote: > This patch renames variable bCurrentHTSupport to bcurrent_ht_support > to fix checkpatch warning Avoid CamelCase. > > Signed-off-by: Tree Davies<tdavies@darkphysics.net> > --- > drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- > drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +- > drivers/staging/rtl8192e/rtl819x_BAProc.c | 12 ++++++------ > drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- > drivers/staging/rtl8192e/rtl819x_HTProc.c | 16 ++++++++-------- > drivers/staging/rtl8192e/rtllib_softmac.c | 16 ++++++++-------- > drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +- > drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++---- > 8 files changed, 30 insertions(+), 30 deletions(-)
Hi Tree,
when I try to apply your patch on the top of all the other patches I get the following error message:
kernel@matrix-ESPRIMO-P710:~/Documents/git/kernels/staging$ git apply -v ~/Downloads/20230706-\[PATCH\]\ staging_\ rtl8192e_\ Rename\ variable\ bCurrentHTSupport-10002.txt Checking patch drivers/staging/rtl8192e/rtl8192e/rtl_core.c... Checking patch drivers/staging/rtl8192e/rtl8192e/rtl_wx.c... Checking patch drivers/staging/rtl8192e/rtl819x_BAProc.c... Checking patch drivers/staging/rtl8192e/rtl819x_HT.h... Checking patch drivers/staging/rtl8192e/rtl819x_HTProc.c... Checking patch drivers/staging/rtl8192e/rtllib_softmac.c... error: while searching for: crypt = ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; encrypt = ieee->host_encrypt && crypt && crypt->ops && ((strcmp(crypt->ops->name, "R-WEP") == 0 || wpa_ie_len)); if (ieee->ht_info->bCurrentHTSupport) { tmp_ht_cap_buf = (u8 *)&(ieee->ht_info->SelfHTCap); tmp_ht_cap_len = sizeof(ieee->ht_info->SelfHTCap); tmp_ht_info_buf = (u8 *)&(ieee->ht_info->SelfHTInfo);
error: patch failed: drivers/staging/rtl8192e/rtllib_softmac.c:816 error: drivers/staging/rtl8192e/rtllib_softmac.c: patch does not apply Checking patch drivers/staging/rtl8192e/rtllib_softmac_wx.c... Checking patch drivers/staging/rtl8192e/rtllib_tx.c...
My be the previous send patches are not taken then your chance is better that this one will fit. Will see what happens.
You need to put your patches into a patch series. This reduces email traffic as the reviewer can just send one email and does not need to send four.
A possible command for a patch series is looking like this: git format-patch -o ~/Documents/kernel/patches/ --cover-letter -n --thread=shallow --to="Greg Kroah-Hartman <gregkh@linuxfoundation.org>,linux-staging@lists.linux.dev,linux-kernel@vger.kernel.org" 4bbbd60d84e15fdb7bffde98a687ed168a4dfbbd^..HEAD
Use the git commit id of your first patch.
Bye Philipp
| |