From 4efdef565f9a0ca3468534f97c6ac4aaaf747c9a Mon Sep 17 00:00:00 2001 From: ed Date: Sat, 27 Sep 2008 08:51:18 +0000 Subject: Replace all calls to minor() with dev2unit(). After I removed all the unit2minor()/minor2unit() calls from the kernel yesterday, I realised calling minor() everywhere is quite confusing. Character devices now only have the ability to store a unit number, not a minor number. Remove the confusion by using dev2unit() everywhere. This commit could also be considered as a bug fix. A lot of drivers call minor(), while they should actually be calling dev2unit(). In -CURRENT this isn't a problem, but it turns out we never had any problem reports related to that issue in the past. I suspect not many people connect more than 256 pieces of the same hardware. Reviewed by: kib --- sys/contrib/pf/net/pf_ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/contrib/pf') diff --git a/sys/contrib/pf/net/pf_ioctl.c b/sys/contrib/pf/net/pf_ioctl.c index 3e99a99..9b35443 100644 --- a/sys/contrib/pf/net/pf_ioctl.c +++ b/sys/contrib/pf/net/pf_ioctl.c @@ -478,7 +478,7 @@ pf_thread_create(void *v) int pfopen(struct cdev *dev, int flags, int fmt, struct proc *p) { - if (minor(dev) >= 1) + if (dev2unit(dev) >= 1) return (ENXIO); return (0); } @@ -486,7 +486,7 @@ pfopen(struct cdev *dev, int flags, int fmt, struct proc *p) int pfclose(struct cdev *dev, int flags, int fmt, struct proc *p) { - if (minor(dev) >= 1) + if (dev2unit(dev) >= 1) return (ENXIO); return (0); } -- cgit v1.1