diff options
| author | ed <ed@FreeBSD.org> | 2008-09-26 14:19:52 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2008-09-26 14:19:52 +0000 |
| commit | 4212d51a7da942b0c717c9965552c9549d90de08 (patch) | |
| tree | f45f750affeffb39e162226343b0db9a110c42ce /sys/net | |
| parent | 0a873f95fe4b1e8d5d3f6ead357fca828948b3ac (diff) | |
| download | FreeBSD-src-4212d51a7da942b0c717c9965552c9549d90de08.zip FreeBSD-src-4212d51a7da942b0c717c9965552c9549d90de08.tar.gz | |
Remove unit2minor() use from kernel code.
When I changed kern_conf.c three months ago I made device unit numbers
equal to (unneeded) device minor numbers. We used to require
bitshifting, because there were eight bits in the middle that were
reserved for a device major number. Not very long after I turned
dev2unit(), minor(), unit2minor() and minor2unit() into macro's.
The unit2minor() and minor2unit() macro's were no-ops.
We'd better not remove these four macro's from the kernel, because there
is a lot of (external) code that may still depend on them. For now it's
harmless to remove all invocations of unit2minor() and minor2unit().
Reviewed by: kib
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if.c | 2 | ||||
| -rw-r--r-- | sys/net/if_tap.c | 4 | ||||
| -rw-r--r-- | sys/net/if_tun.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sys/net/if.c b/sys/net/if.c index 11df979..0bc0329 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -514,7 +514,7 @@ if_attach(struct ifnet *ifp) #endif ifdev_setbyindex(ifp->if_index, make_dev(&net_cdevsw, - unit2minor(ifp->if_index), UID_ROOT, GID_WHEEL, 0600, "%s/%s", + ifp->if_index, UID_ROOT, GID_WHEEL, 0600, "%s/%s", net_cdevsw.d_name, ifp->if_xname)); make_dev_alias(ifdev_byindex(ifp->if_index), "%s%d", net_cdevsw.d_name, ifp->if_index); diff --git a/sys/net/if_tap.c b/sys/net/if_tap.c index 0e0b25c..25728f4 100644 --- a/sys/net/if_tap.c +++ b/sys/net/if_tap.c @@ -190,7 +190,7 @@ tap_clone_create(struct if_clone *ifc, int unit, caddr_t params) /* find any existing device, or allocate new unit number */ i = clone_create(&tapclones, &tap_cdevsw, &unit, &dev, extra); if (i) { - dev = make_dev(&tap_cdevsw, unit2minor(unit | extra), + dev = make_dev(&tap_cdevsw, unit | extra, UID_ROOT, GID_WHEEL, 0600, "%s%d", ifc->ifc_name, unit); if (dev != NULL) { dev_ref(dev); @@ -381,7 +381,7 @@ tapclone(void *arg, struct ucred *cred, char *name, int namelen, struct cdev **d name = devname; } - *dev = make_dev(&tap_cdevsw, unit2minor(unit | extra), + *dev = make_dev(&tap_cdevsw, unit | extra, UID_ROOT, GID_WHEEL, 0600, "%s", name); if (*dev != NULL) { dev_ref(*dev); diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index 6f6f05c..24f3187 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -183,7 +183,7 @@ tun_clone_create(struct if_clone *ifc, int unit, caddr_t params) i = clone_create(&tunclones, &tun_cdevsw, &unit, &dev, 0); if (i) { /* No preexisting struct cdev *, create one */ - dev = make_dev(&tun_cdevsw, unit2minor(unit), + dev = make_dev(&tun_cdevsw, unit, UID_UUCP, GID_DIALER, 0600, "%s%d", ifc->ifc_name, unit); if (dev != NULL) { dev_ref(dev); @@ -233,7 +233,7 @@ tunclone(void *arg, struct ucred *cred, char *name, int namelen, name = devname; } /* No preexisting struct cdev *, create one */ - *dev = make_dev(&tun_cdevsw, unit2minor(u), + *dev = make_dev(&tun_cdevsw, u, UID_UUCP, GID_DIALER, 0600, "%s", name); if (*dev != NULL) { dev_ref(*dev); |
