[src/trunk]: src/sys/net/lagg lagg(4): commonize the error handling

[yamaguchi <yamaguchi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6ddef653f96b
branches:  trunk
changeset: 364590:6ddef653f96b
user:      yamaguchi <yamaguchi%NetBSD.org@localhost>
date:      Thu Mar 31 01:42:40 2022 +0000

description:
lagg(4): commonize the error handling

diffstat:

 sys/net/lagg/if_lagg.c |  50 ++++++++++++++++++++++++++------------------------
 1 files changed, 26 insertions(+), 24 deletions(-)

diffs (95 lines):

diff -r 41f3d29ceffe -r 6ddef653f96b sys/net/lagg/if_lagg.c
--- a/sys/net/lagg/if_lagg.c    Thu Mar 31 01:40:34 2022 +0000
+++ b/sys/net/lagg/if_lagg.c    Thu Mar 31 01:42:40 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_lagg.c,v 1.31 2022/03/31 01:39:09 yamaguchi Exp $   */
+/*     $NetBSD: if_lagg.c,v 1.32 2022/03/31 01:42:40 yamaguchi Exp $   */
 
 /*
  * Copyright (c) 2005, 2006 Reyk Floeter <reyk%openbsd.org@localhost>
@@ -20,7 +20,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.31 2022/03/31 01:39:09 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.32 2022/03/31 01:42:40 yamaguchi Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -1371,16 +1371,10 @@
 
        pr = var->lv_proto;
 
-       if (is_up) {
-               if (lagg_protos[pr].pr_up != NULL)
-                       error = lagg_protos[pr].pr_up(var->lv_psc);
-               else
-                       error = 0;
-       } else {
-               if (lagg_protos[pr].pr_down != NULL)
-                       lagg_protos[pr].pr_down(var->lv_psc);
-               else
-                       error = 0;
+       if (is_up && lagg_protos[pr].pr_up != NULL) {
+               error = lagg_protos[pr].pr_up(var->lv_psc);
+       } else if (!is_up && lagg_protos[pr].pr_down != NULL) {
+               lagg_protos[pr].pr_down(var->lv_psc);
        }
 
        lagg_variant_putref(var, &psref);
@@ -1423,35 +1417,43 @@
 
        pr = var->lv_proto;
 
-       error = EPROTONOSUPPORT;
        switch (ctrl) {
        case LAGG_PORTCTRL_ALLOC:
-               if (lagg_protos[pr].pr_allocport != NULL)
-                       error = lagg_protos[pr].pr_allocport(var->lv_psc, lp);
+               if (lagg_protos[pr].pr_allocport == NULL) {
+                       goto nosupport;
+               }
+               error = lagg_protos[pr].pr_allocport(var->lv_psc, lp);
                break;
        case LAGG_PORTCTRL_FREE:
-               if (lagg_protos[pr].pr_freeport != NULL) {
-                       lagg_protos[pr].pr_freeport(var->lv_psc, lp);
-                       error = 0;
+               if (lagg_protos[pr].pr_freeport == NULL) {
+                       goto nosupport;
                }
+               lagg_protos[pr].pr_freeport(var->lv_psc, lp);
                break;
        case LAGG_PORTCTRL_START:
-               if (lagg_protos[pr].pr_startport != NULL) {
-                       lagg_protos[pr].pr_startport(var->lv_psc, lp);
-                       error = 0;
+               if (lagg_protos[pr].pr_startport == NULL) {
+                       goto nosupport;
                }
+               lagg_protos[pr].pr_startport(var->lv_psc, lp);
                break;
        case LAGG_PORTCTRL_STOP:
-               if (lagg_protos[pr].pr_stopport != NULL) {
-                       lagg_protos[pr].pr_stopport(var->lv_psc, lp);
-                       error = 0;
+               if (lagg_protos[pr].pr_stopport == NULL) {
+                       goto nosupport;
                }
+               lagg_protos[pr].pr_stopport(var->lv_psc, lp);
                break;
+       default:
+               goto nosupport;
        }
 
        lagg_variant_putref(var, &psref);
        curlwp_bindx(bound);
        return error;
+
+nosupport:
+       lagg_variant_putref(var, &psref);
+       curlwp_bindx(bound);
+       return EPROTONOSUPPORT;
 }
 
 static int