Module Name: src
Committed By: yamaguchi
Date: Thu Apr 4 08:50:58 UTC 2024
Modified Files:
src/sys/net/lagg: if_lagg.c
Log Message:
lagg(4): replace NULL check with KASSERT because lp_softc is always non-NULL
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/net/lagg/if_lagg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/lagg/if_lagg.c
diff -u src/sys/net/lagg/if_lagg.c:1.65 src/sys/net/lagg/if_lagg.c:1.66
--- src/sys/net/lagg/if_lagg.c:1.65 Thu Apr 4 08:38:22 2024
+++ src/sys/net/lagg/if_lagg.c Thu Apr 4 08:50:58 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_lagg.c,v 1.65 2024/04/04 08:38:22 yamaguchi Exp $ */
+/* $NetBSD: if_lagg.c,v 1.66 2024/04/04 08:50:58 yamaguchi Exp $ */
/*
* Copyright (c) 2005, 2006 Reyk Floeter <r...@openbsd.org>
@@ -20,7 +20,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.65 2024/04/04 08:38:22 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_lagg.c,v 1.66 2024/04/04 08:50:58 yamaguchi Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2711,10 +2711,11 @@ lagg_port_ioctl(struct ifnet *ifp, u_lon
int error = 0;
u_int ifflags;
- if ((lp = ifp->if_lagg) == NULL ||
- (sc = lp->lp_softc) == NULL) {
+ if ((lp = ifp->if_lagg) == NULL)
goto fallback;
- }
+
+ sc = lp->lp_softc;
+ KASSERT(sc != NULL);
KASSERT(IFNET_LOCKED(lp->lp_ifp));
@@ -2786,12 +2787,9 @@ lagg_ifdetach(void *xifp_port)
if (lp == NULL) {
pserialize_read_exit(s);
return;
- }
-
- sc = lp->lp_softc;
- if (sc == NULL) {
- pserialize_read_exit(s);
- return;
+ } else {
+ sc = lp->lp_softc;
+ KASSERT(sc != NULL);
}
pserialize_read_exit(s);
