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

From: Bongsu Jeon <bongsu.jeon@samsung.com>

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 <bongsu.jeon@samsung.com>
---
 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

On Tue, 19 Jan 2021 05:55:22 +0900 Bongsu Jeon wrote:

From: Bongsu Jeon <bongsu.jeon@samsung.com>

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 <bongsu.jeon@samsung.com>

What's the Fixes tag for this change?

On Tue, Jan 19, 2021 at 6:01 AM Jakub Kicinski [off-list ref] wrote:

On Tue, 19 Jan 2021 05:55:22 +0900 Bongsu Jeon wrote:

quoted

From: Bongsu Jeon <bongsu.jeon@samsung.com>

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 <bongsu.jeon@samsung.com>

What's the Fixes tag for this change?

Sorry to miss the Fixes tag.
This is the Fixes tag ( Fixes: bcd684aace34 ("net/nfc/nci: Support NCI
2.x initial sequence") )
Could I resend this patch after adding that tag?

On Tue, 19 Jan 2021 06:19:23 +0900 Bongsu Jeon wrote:

On Tue, Jan 19, 2021 at 6:01 AM Jakub Kicinski [off-list ref] wrote:

quoted

On Tue, 19 Jan 2021 05:55:22 +0900 Bongsu Jeon wrote:  

quoted

From: Bongsu Jeon <bongsu.jeon@samsung.com>

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 <bongsu.jeon@samsung.com>  

What's the Fixes tag for this change?  

Sorry to miss the Fixes tag.
This is the Fixes tag ( Fixes: bcd684aace34 ("net/nfc/nci: Support NCI
2.x initial sequence") )
Could I resend this patch after adding that tag?

It's fine no need to repost, I can add the tag when applying the patch,
let's wait for reviews. Let me just place it on a line of its own,
patchwork is supposed to pick that up automatically:

Fixes: bcd684aace34 ("net/nfc/nci: Support NCI 2.x initial sequence")

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 <bongsu.jeon@samsung.com>

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 <bongsu.jeon@samsung.com>

[...]

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

On Wed, Jan 20, 2021 at 10:00 AM [off-list ref] wrote:

Hello:

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

On Tue, 19 Jan 2021 05:55:22 +0900 you wrote:

quoted

From: Bongsu Jeon <bongsu.jeon@samsung.com>

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 <bongsu.jeon@samsung.com>

[...]

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.

On Wed, 20 Jan 2021 18:54:17 +0900 Bongsu Jeon wrote:

On Wed, Jan 20, 2021 at 10:00 AM [off-list ref] wrote:

quoted

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

On Tue, 19 Jan 2021 05:55:22 +0900 you wrote:  

quoted

From: Bongsu Jeon <bongsu.jeon@samsung.com>

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 <bongsu.jeon@samsung.com>

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.