Message ID | 20210203071541.86138-1-xie.he.0141@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 81b8be68ef8e8915d0cc6cedd2ac425c74a24813 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net] net: hdlc_x25: Return meaningful error code in x25_open | expand |
Context | Check | Description |
---|---|---|
netdev/cover_letter | success | Link |
netdev/fixes_present | success | Link |
netdev/patch_count | success | Link |
netdev/tree_selection | success | Clearly marked for net |
netdev/subject_prefix | success | Link |
netdev/cc_maintainers | success | CCed 6 of 6 maintainers |
netdev/source_inline | success | Was 0 now: 0 |
netdev/verify_signedoff | success | Link |
netdev/module_param | success | Was 0 now: 0 |
netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
netdev/verify_fixes | success | Link |
netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 21 lines checked |
netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
netdev/header_inline | success | Link |
netdev/stable | success | Stable not CCed |
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 <ms@dev.tdt.de> > Signed-off-by: Xie He <xie.he.0141@gmail.com> > --- > 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, ¶ms); > 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, ¶ms); > if (result != LAPB_OK) > - return result; > + return -EINVAL; > > return 0; > } Thanks for fixing this. Acked-by: Martin Schiller <ms@dev.tdt.de>
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 <ms@dev.tdt.de> > Signed-off-by: Xie He <xie.he.0141@gmail.com> > > [...] 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
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, ¶ms); 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, ¶ms); if (result != LAPB_OK) - return result; + return -EINVAL; return 0; }
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 <ms@dev.tdt.de> Signed-off-by: Xie He <xie.he.0141@gmail.com> --- drivers/net/wan/hdlc_x25.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)