git: 8e1af80243ff - main - IfAPI: make if_getlladdr() to return char HEAD branches config description git-daemon-export-ok gl-conf hooks info objects packed-refs refs

[Gleb Smirnoff]

The branch main has been updated by glebius:

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

commit 8e1af80243ff97f56918b363196832af9406597e
Author:     Gleb Smirnoff <gleb...@freebsd.org>
AuthorDate: 2024-12-09 16:18:56 +0000
Commit:     Gleb Smirnoff <gleb...@freebsd.org>
CommitDate: 2024-12-09 16:18:56 +0000

    IfAPI: make if_getlladdr() to return char *
    
    No functional change.  The caddr_t is a relic typedef from C version
    that didn't have void pointer.  In this particular change we really
    need a char * pointer rather than void, because some consumers use
    the link level address as a char array.
---
 sys/net/if.c     | 2 +-
 sys/net/if_var.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/net/if.c b/sys/net/if.c
index 25cad0222c06..08c59627b196 100644
--- a/sys/net/if.c
+++ b/sys/net/if.c
@@ -4888,7 +4888,7 @@ if_setifheaderlen(if_t ifp, int len)
        return (0);
 }
 
-caddr_t
+char *
 if_getlladdr(const if_t ifp)
 {
        return (IF_LLADDR(ifp));
diff --git a/sys/net/if_var.h b/sys/net/if_var.h
index a0271cfe2a7c..83d33330987e 100644
--- a/sys/net/if_var.h
+++ b/sys/net/if_var.h
@@ -643,7 +643,7 @@ void if_setrcvif(struct mbuf *m, if_t ifp);
 void if_setvtag(struct mbuf *m, u_int16_t tag);
 u_int16_t if_getvtag(struct mbuf *m);
 int if_vlantrunkinuse(if_t ifp);
-caddr_t if_getlladdr(const if_t ifp);
+char *if_getlladdr(const if_t ifp);
 struct vnet *if_getvnet(const if_t ifp);
 void *if_gethandle(u_char);
 void if_vlancap(if_t ifp);