diff options
| author | Marcel Moolenaar <marcel@FreeBSD.org> | 2001-12-04 03:55:10 +0000 |
|---|---|---|
| committer | Marcel Moolenaar <marcel@FreeBSD.org> | 2001-12-04 03:55:10 +0000 |
| commit | 53b9d88fc4372639e6bb6db3e92a7f0f2b75d750 (patch) | |
| tree | 500f12bec4699f58c3a823d3d76eb68222f261d7 /sys/compat/linux/linux_ioctl.c | |
| parent | 54d88951996584490aa95ca7d25fd2aba3235f23 (diff) | |
Notes
Diffstat (limited to 'sys/compat/linux/linux_ioctl.c')
| -rw-r--r-- | sys/compat/linux/linux_ioctl.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index d3eea0d5de6e..31cdd6a01526 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -1793,6 +1793,7 @@ ifname_linux_to_bsd(const char *lxname, char *bsdname) struct ifnet *ifp; int len, unit; char *ep; + int is_eth, index; for (len = 0; len < LINUX_IFNAMSIZ; ++len) if (!isalpha(lxname[len])) @@ -1802,13 +1803,18 @@ ifname_linux_to_bsd(const char *lxname, char *bsdname) unit = (int)strtoul(lxname + len, &ep, 10); if (ep == NULL || ep == lxname + len || ep >= lxname + LINUX_IFNAMSIZ) return (NULL); + index = 0; + is_eth = (len == 3 && !strncmp(lxname, "eth", len)) ? 1 : 0; TAILQ_FOREACH(ifp, &ifnet, if_link) { - /* allow Linux programs to use FreeBSD names */ + /* + * Allow Linux programs to use FreeBSD names. Don't presume + * we never have an interface named "eth", so don't make + * the test optional based on is_eth. + */ if (ifp->if_unit == unit && ifp->if_name[len] == '\0' && strncmp(ifp->if_name, lxname, len) == 0) break; - if (ifp->if_index == unit && IFP_IS_ETH(ifp) && - strncmp(lxname, "eth", len) == 0) + if (is_eth && IFP_IS_ETH(ifp) && unit == index++) break; } if (ifp != NULL) |