2021-01-19 05:18:54

by Bongsu Jeon

[permalink] [raw]
Subject: [PATCH net] net: nfc: nci: fix the wrong NCI_CORE_INIT parameters

From: Bongsu Jeon <[email protected]>

Fix the code because NCI_CORE_INIT_CMD includes two parameters in NCI2.0
but there is no parameters in NCI1.x.

Signed-off-by: Bongsu Jeon <[email protected]>
---
net/nfc/nci/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index e64727e1a72f..02a1f13f0798 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -508,7 +508,7 @@ static int nci_open_device(struct nci_dev *ndev)
};
unsigned long opt = 0;

- if (!(ndev->nci_ver & NCI_VER_2_MASK))
+ if (ndev->nci_ver & NCI_VER_2_MASK)
opt = (unsigned long)&nci_init_v2_cmd;

rc = __nci_request(ndev, nci_init_req, opt,
--
2.25.1


2021-01-20 01:03:26

by patchwork-bot+netdevbpf

[permalink] [raw]
Subject: Re: [PATCH net] net: nfc: nci: fix the wrong NCI_CORE_INIT parameters

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Tue, 19 Jan 2021 05:55:22 +0900 you wrote:
> From: Bongsu Jeon <[email protected]>
>
> Fix the code because NCI_CORE_INIT_CMD includes two parameters in NCI2.0
> but there is no parameters in NCI1.x.
>
> Signed-off-by: Bongsu Jeon <[email protected]>
>
> [...]

Here is the summary with links:
- [net] net: nfc: nci: fix the wrong NCI_CORE_INIT parameters
https://git.kernel.org/netdev/net/c/4964e5a1e080

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html


2021-01-20 10:46:58

by Bongsu Jeon

[permalink] [raw]
Subject: Re: [PATCH net] net: nfc: nci: fix the wrong NCI_CORE_INIT parameters

On Wed, Jan 20, 2021 at 10:00 AM <[email protected]> wrote:
>
> Hello:
>
> This patch was applied to netdev/net.git (refs/heads/master):
>
> On Tue, 19 Jan 2021 05:55:22 +0900 you wrote:
> > From: Bongsu Jeon <[email protected]>
> >
> > Fix the code because NCI_CORE_INIT_CMD includes two parameters in NCI2.0
> > but there is no parameters in NCI1.x.
> >
> > Signed-off-by: Bongsu Jeon <[email protected]>
> >
> > [...]
>
> Here is the summary with links:
> - [net] net: nfc: nci: fix the wrong NCI_CORE_INIT parameters
> https://git.kernel.org/netdev/net/c/4964e5a1e080
>
> You are awesome, thank you!
> --
> Deet-doot-dot, I am a bot.
> https://korg.docs.kernel.org/patchwork/pwbot.html
>
>

Could you merge this patch to net-next repo??
NCI selftest that i will send will fail if this patch isn't merged.

2021-01-20 17:01:17

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH net] net: nfc: nci: fix the wrong NCI_CORE_INIT parameters

On Wed, 20 Jan 2021 18:54:17 +0900 Bongsu Jeon wrote:
> On Wed, Jan 20, 2021 at 10:00 AM <[email protected]> wrote:
> > This patch was applied to netdev/net.git (refs/heads/master):
> >
> > On Tue, 19 Jan 2021 05:55:22 +0900 you wrote:
> > > From: Bongsu Jeon <[email protected]>
> > >
> > > Fix the code because NCI_CORE_INIT_CMD includes two parameters in NCI2.0
> > > but there is no parameters in NCI1.x.
> > >
> > > Signed-off-by: Bongsu Jeon <[email protected]>
>
> Could you merge this patch to net-next repo??
> NCI selftest that i will send will fail if this patch isn't merged.

It happens periodically, should happen today or tomorrow.