The branch stable/14 has been updated by zlei:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=bcd1e5fb540ffed26b25f520a69e092423f8ccaa

commit bcd1e5fb540ffed26b25f520a69e092423f8ccaa
Author:     Justin Hibbits <[email protected]>
AuthorDate: 2023-08-25 16:44:17 +0000
Commit:     Zhenlei Huang <[email protected]>
CommitDate: 2025-12-26 08:25:47 +0000

    mac_ipacl: Use IfAPI
    
    Use `if_t` instead of `struct ifnet *`, and if_name() accessor.
    
    Sponsored by:   Juniper Networks, Inc.
    
    (cherry picked from commit b820820ece099a73511d7daec407d78f38185a9b)
---
 sys/security/mac_ipacl/mac_ipacl.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/security/mac_ipacl/mac_ipacl.c 
b/sys/security/mac_ipacl/mac_ipacl.c
index 69802845252a..eed3eddace89 100644
--- a/sys/security/mac_ipacl/mac_ipacl.c
+++ b/sys/security/mac_ipacl/mac_ipacl.c
@@ -315,7 +315,7 @@ SYSCTL_PROC(_security_mac_ipacl, OID_AUTO, rules,
 
 static int
 rules_check(struct ucred *cred,
-    struct ipacl_addr *ip_addr, struct ifnet *ifp)
+    struct ipacl_addr *ip_addr, if_t ifp)
 {
        struct ip_rule *rule;
        int error;
@@ -342,7 +342,7 @@ rules_check(struct ucred *cred,
                        continue;
 
                if (strcmp(rule->if_name, "\0") &&
-                   strcmp(rule->if_name, ifp->if_xname))
+                   strcmp(rule->if_name, if_name(ifp)))
                        continue;
 
                switch (rule->af) {
@@ -395,7 +395,7 @@ rules_check(struct ucred *cred,
 #ifdef INET
 static int
 ipacl_ip4_check_jail(struct ucred *cred,
-    const struct in_addr *ia, struct ifnet *ifp)
+    const struct in_addr *ia, if_t ifp)
 {
        struct ipacl_addr ip4_addr;
 
@@ -415,7 +415,7 @@ ipacl_ip4_check_jail(struct ucred *cred,
 #ifdef INET6
 static int
 ipacl_ip6_check_jail(struct ucred *cred,
-    const struct in6_addr *ia6, struct ifnet *ifp)
+    const struct in6_addr *ia6, if_t ifp)
 {
        struct ipacl_addr ip6_addr;
 

Reply via email to