diff options
Diffstat (limited to 'misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-dahdi-base.c')
| -rw-r--r-- | misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-dahdi-base.c | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-dahdi-base.c b/misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-dahdi-base.c deleted file mode 100644 index feebe1d03720..000000000000 --- a/misc/dahdi-kmod/files/patch-freebsd-drivers-dahdi-dahdi-base.c +++ /dev/null @@ -1,45 +0,0 @@ ---- freebsd/drivers/dahdi/dahdi-base.c.orig 2021-11-09 20:52:37 UTC -+++ freebsd/drivers/dahdi/dahdi-base.c -@@ -48,6 +48,7 @@ - #include <sys/module.h> - #include <sys/poll.h> - #include <net/ppp_defs.h> -+#include <sys/eventhandler.h> - - #include "version.h" - -@@ -4344,8 +4345,7 @@ static int dahdi_common_ioctl(struct file *file, unsig - if (spans[i]->manufacturer) - dahdi_copy_string(stack.spaninfo.manufacturer, spans[i]->manufacturer, - sizeof(stack.spaninfo.manufacturer)); -- if (spans[i]->devicetype) -- dahdi_copy_string(stack.spaninfo.devicetype, spans[i]->devicetype, sizeof(stack.spaninfo.devicetype)); -+ dahdi_copy_string(stack.spaninfo.devicetype, spans[i]->devicetype, sizeof(stack.spaninfo.devicetype)); - dahdi_copy_string(stack.spaninfo.location, spans[i]->location, sizeof(stack.spaninfo.location)); - if (spans[i]->spantype) - dahdi_copy_string(stack.spaninfo.spantype, spans[i]->spantype, sizeof(stack.spaninfo.spantype)); -@@ -4406,10 +4406,9 @@ static int dahdi_common_ioctl(struct file *file, unsig - dahdi_copy_string(stack.spaninfo_v1.manufacturer, - spans[i]->manufacturer, - sizeof(stack.spaninfo_v1.manufacturer)); -- if (spans[i]->devicetype) -- dahdi_copy_string(stack.spaninfo_v1.devicetype, -- spans[i]->devicetype, -- sizeof(stack.spaninfo_v1.devicetype)); -+ dahdi_copy_string(stack.spaninfo_v1.devicetype, -+ spans[i]->devicetype, -+ sizeof(stack.spaninfo_v1.devicetype)); - dahdi_copy_string(stack.spaninfo_v1.location, - spans[i]->location, - sizeof(stack.spaninfo_v1.location)); -@@ -9263,7 +9262,9 @@ static struct cdevsw dahdi_devsw = { - .d_poll = dahdi_device_poll, - .d_mmap = dahdi_device_mmap, - .d_name = "dahdi", --#if __FreeBSD_version >= 800039 -+#if __FreeBSD_version >= 1000000 -+ .d_flags = D_TRACKCLOSE | D_NEEDMINOR, -+#elif __FreeBSD_version >= 800039 - .d_flags = D_PSEUDO | D_TRACKCLOSE | D_NEEDMINOR - #else - .d_flags = D_PSEUDO | D_TRACKCLOSE |