2.6.39 removed the BKL. These patches to zaptel are getting messy; I'm sure there's a better way to do this but I've got something that works on 2.6.39. Probably should be tested on other kernel versions.
Signed-off-by: Kristian Kielhofner <k...@kriskinc.com> -- Kristian Kielhofner
Index: libs/zaptel-1.4.x/patches/380-2.6.39.patch =================================================================== --- libs/zaptel-1.4.x/patches/380-2.6.39.patch (revision 0) +++ libs/zaptel-1.4.x/patches/380-2.6.39.patch (revision 0) @@ -0,0 +1,21 @@ +--- zaptel-1.4.12.1/kernel/zaptel-base.c.orig 2011-10-12 17:32:31.772758001 -0400 ++++ zaptel-1.4.12.1/kernel/zaptel-base.c 2011-10-12 17:56:26.929758001 -0400 +@@ -5181,7 +5181,17 @@ + return zt_chan_ioctl(inode, file, cmd, data, unit); + } + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39) ++static long zt_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long data) ++{ ++ int ret; ++ ++ ret = zt_ioctl(file->f_path.dentry->d_inode, file, cmd, data); ++ ++ return ret; ++} ++ ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36) + #include <linux/smp_lock.h> + static long zt_ioctl_unlocked(struct file *file, unsigned int cmd, unsigned long data) + {
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel