git: 8243e174630f - main - linux(4): Fixup 5c32488de0 mis-merge
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 04 Mar 2023 09:42:14 UTC
The branch main has been updated by dchagin:
URL: https://cgit.FreeBSD.org/src/commit/?id=8243e174630f09654ae8b93bce8b7d84448bdcf3
commit 8243e174630f09654ae8b93bce8b7d84448bdcf3
Author: Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2023-03-04 09:42:04 +0000
Commit: Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2023-03-04 09:42:04 +0000
linux(4): Fixup 5c32488de0 mis-merge
---
sys/compat/linux/linux.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c
index 252645cf2ae5..dcf5ac1e6892 100644
--- a/sys/compat/linux/linux.c
+++ b/sys/compat/linux/linux.c
@@ -436,6 +436,8 @@ linux_ifflags(struct ifnet *ifp)
{
unsigned short flags;
+ NET_EPOCH_ASSERT();
+
flags = if_getflags(ifp) | if_getdrvflags(ifp);
return (bsd_to_linux_ifflags(flags));
}