d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This is a direct commit to the vendor branch with code from the vendor.

Browse Source 
Replace the if_name and if_unit members of struct ifnet with new members
if_xname, if_dname, and if_dunit. if_xname is the name of the interface
and if_dname/unit are the driver name and instance.

This change paves the way for interface renaming and enhanced pseudo
device creation and configuration symantics.

Submitted by:	darrenr
Approved by:	re (scottl)
This commit is contained in:
brooks 2003-12-02 18:33:36 +00:00
parent bb1b56a0d0
commit 244f075414
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/ipfilter/ipt.c
View File

@ -443,7 +443,8 @@ char *getifname(ptr)
void *ptr; void *ptr;
{ {
#if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ #if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
defined(__OpenBSD__) defined(__OpenBSD__) || \
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
#else #else
char buf[32], *s; char buf[32], *s;
int len; int len;
@ -458,7 +459,8 @@ void *ptr;
if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1) if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1)
return "X"; return "X";
#if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ #if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
defined(__OpenBSD__) defined(__OpenBSD__) || \
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
return strdup(netif.if_xname); return strdup(netif.if_xname);
#else #else
if (kmemcpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1) if (kmemcpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1)

6
contrib/ipfilter/kmem.c
View File

@ -204,7 +204,8 @@ void *ptr;
return ifname; return ifname;
#else #else
# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ # if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
defined(__OpenBSD__) defined(__OpenBSD__) || \
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
#else #else
char buf[32]; char buf[32];
int len; int len;
@ -219,7 +220,8 @@ void *ptr;
if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1) if (kmemcpy((char *)&netif, (u_long)ptr, sizeof(netif)) == -1)
return "X"; return "X";
# if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \ # if defined(NetBSD) && (NetBSD >= 199905) && (NetBSD < 1991011) || \
defined(__OpenBSD__) defined(__OpenBSD__) || \
(defined(__FreeBSD__) && (__FreeBSD_version >= 501113))
return strdup(netif.if_xname); return strdup(netif.if_xname);
# else # else
if (kstrncpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1) if (kstrncpy(buf, (u_long)netif.if_name, sizeof(buf)) == -1)