Module Name: src
Committed By: knakahara
Date: Fri Mar 6 10:26:59 UTC 2020
Modified Files:
src/sys/net: if_spppsubr.c
Log Message:
remove unnecessary lock in sppp_mediastatus() as it doesn't touch struct sppp.
ok'ed by yamaguchi@n.o.
To generate a diff of this commit:
cvs rdiff -u -r1.186 -r1.187 src/sys/net/if_spppsubr.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/if_spppsubr.c
diff -u src/sys/net/if_spppsubr.c:1.186 src/sys/net/if_spppsubr.c:1.187
--- src/sys/net/if_spppsubr.c:1.186 Tue Feb 4 05:46:32 2020
+++ src/sys/net/if_spppsubr.c Fri Mar 6 10:26:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_spppsubr.c,v 1.186 2020/02/04 05:46:32 thorpej Exp $ */
+/* $NetBSD: if_spppsubr.c,v 1.187 2020/03/06 10:26:59 knakahara Exp $ */
/*
* Synchronous PPP/Cisco link level subroutines.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.186 2020/02/04 05:46:32 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_spppsubr.c,v 1.187 2020/03/06 10:26:59 knakahara Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -972,11 +972,10 @@ sppp_mediachange(struct ifnet *ifp)
static void
sppp_mediastatus(struct ifnet *ifp, struct ifmediareq *imr)
{
- struct sppp *sp = (struct sppp *)ifp;
-
- SPPP_LOCK(sp, RW_WRITER);
+ int link_state;
- switch (ifp->if_link_state) {
+ link_state = atomic_load_relaxed(&ifp->if_link_state);
+ switch (link_state) {
case LINK_STATE_UP:
imr->ifm_status = IFM_AVALID | IFM_ACTIVE;
break;
@@ -988,8 +987,6 @@ sppp_mediastatus(struct ifnet *ifp, stru
imr->ifm_status = 0;
break;
}
-
- SPPP_UNLOCK(sp);
}
void
