2021-02-03 07:19:13

by Xie He

[permalink] [raw]
Subject: [PATCH net] net: hdlc_x25: Return meaningful error code in x25_open

It's not meaningful to pass on LAPB error codes to HDLC code or other
parts of the system, because they will not understand the error codes.

Instead, use system-wide recognizable error codes.

Fixes: f362e5fe0f1f ("wan/hdlc_x25: make lapb params configurable")
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: Martin Schiller <[email protected]>
Signed-off-by: Xie He <[email protected]>
---
drivers/net/wan/hdlc_x25.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c
index bb164805804e..4aaa6388b9ee 100644
--- a/drivers/net/wan/hdlc_x25.c
+++ b/drivers/net/wan/hdlc_x25.c
@@ -169,11 +169,11 @@ static int x25_open(struct net_device *dev)

result = lapb_register(dev, &cb);
if (result != LAPB_OK)
- return result;
+ return -ENOMEM;

result = lapb_getparms(dev, &params);
if (result != LAPB_OK)
- return result;
+ return -EINVAL;

if (state(hdlc)->settings.dce)
params.mode = params.mode | LAPB_DCE;
@@ -188,7 +188,7 @@ static int x25_open(struct net_device *dev)

result = lapb_setparms(dev, &params);
if (result != LAPB_OK)
- return result;
+ return -EINVAL;

return 0;
}
--
2.27.0


2021-02-04 06:24:54

by Martin Schiller

[permalink] [raw]
Subject: Re: [PATCH net] net: hdlc_x25: Return meaningful error code in x25_open

On 2021-02-03 08:15, Xie He wrote:
> It's not meaningful to pass on LAPB error codes to HDLC code or other
> parts of the system, because they will not understand the error codes.
>
> Instead, use system-wide recognizable error codes.
>
> Fixes: f362e5fe0f1f ("wan/hdlc_x25: make lapb params configurable")
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> Cc: Martin Schiller <[email protected]>
> Signed-off-by: Xie He <[email protected]>
> ---
> drivers/net/wan/hdlc_x25.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c
> index bb164805804e..4aaa6388b9ee 100644
> --- a/drivers/net/wan/hdlc_x25.c
> +++ b/drivers/net/wan/hdlc_x25.c
> @@ -169,11 +169,11 @@ static int x25_open(struct net_device *dev)
>
> result = lapb_register(dev, &cb);
> if (result != LAPB_OK)
> - return result;
> + return -ENOMEM;
>
> result = lapb_getparms(dev, &params);
> if (result != LAPB_OK)
> - return result;
> + return -EINVAL;
>
> if (state(hdlc)->settings.dce)
> params.mode = params.mode | LAPB_DCE;
> @@ -188,7 +188,7 @@ static int x25_open(struct net_device *dev)
>
> result = lapb_setparms(dev, &params);
> if (result != LAPB_OK)
> - return result;
> + return -EINVAL;
>
> return 0;
> }

Thanks for fixing this.

Acked-by: Martin Schiller <[email protected]>

2021-02-05 02:37:36

by patchwork-bot+netdevbpf

[permalink] [raw]
Subject: Re: [PATCH net] net: hdlc_x25: Return meaningful error code in x25_open

Hello:

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

On Tue, 2 Feb 2021 23:15:41 -0800 you wrote:
> It's not meaningful to pass on LAPB error codes to HDLC code or other
> parts of the system, because they will not understand the error codes.
>
> Instead, use system-wide recognizable error codes.
>
> Fixes: f362e5fe0f1f ("wan/hdlc_x25: make lapb params configurable")
> Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
> Cc: Martin Schiller <[email protected]>
> Signed-off-by: Xie He <[email protected]>
>
> [...]

Here is the summary with links:
- [net] net: hdlc_x25: Return meaningful error code in x25_open
https://git.kernel.org/netdev/net/c/81b8be68ef8e

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