main/dahdi-linux-vanilla: upgrade to 3.0.0 and kernel 4.19.12

5 files changed, 4 insertions, 474 deletions

diff --git a/main/dahdi-linux-vanilla/APKBUILD b/main/dahdi-linux-vanilla/APKBUILD
index 8435c09f05..4a1312cd4f 100644
--- a/main/dahdi-linux-vanilla/APKBUILD
+++ b/main/dahdi-linux-vanilla/APKBUILD
@@ -3,12 +3,12 @@
 
 # when changing _ver we *must* bump _rel
 _name=dahdi-linux
-_ver=2.11.1
+_ver=3.0.0
 _rel=0
 
 _flavor=${FLAVOR:-vanilla}
 _kpkg=linux-$_flavor
-_kver=4.14.89
+_kver=4.19.12
 _krel=0
 
 _kpkgver="$_kver-r$_krel"
@@ -37,10 +37,6 @@ source="http://downloads.digium.com/pub/telephony/dahdi-linux/releases/${_name}-
 	zaphfc-dahdi-2.5.0.patch
 	zaphfc-dahdi-2.6.0.patch
 	zaphfc-dahdi-2.7.0.patch
-	linux-3.13.patch
-	linux-4.4.patch
-	linux-4.11.patch
-	linux-4.13.patch
 	"
 
 builddir="$srcdir/$_name-$_ver"
@@ -86,7 +82,7 @@ dev() {
 	ln -s /usr/include "$dir"/include
 }
 
-sha512sums="db15d9237f157b5349de8f4cdb45573ed42e1dd25c83f900835c7e15637a19e1e95c7c990dc786c1e3f37f32419f3d009e179d27b5d16421789ff9bc76f54224  dahdi-linux-2.11.1.tar.gz
+sha512sums="7c281059f4c8faf3733f7790dc184d810a4a2839ceaa79d6190128bea182db38bc293f04a996254950531abea5532cb030d50265cd044e0847f1e8ece7b15395  dahdi-linux-3.0.0.tar.gz
 aba01eb90d9db1c595ff22078c76aadb20900486b5794d38b7ee61fa30d2fb51be318a4d059246017640447aee03fb09bb5514c818e3caa1cd98e331ec065173  dahdi-depmod.patch
 fa2fa9e96eefc0f31a1a4a8f8f44e77936f6da0d7b74fe3c3d1f0de085621744ae4367932ac97a10b7f96b7d0954843b0bfe07a251b85434079cc6da29e243ba  dahdi-bri_dchan.patch
 8ef31c9723237da83954832df5aee1f5daa23f8fefe07a1a191a2c5da2c2308001d68cee83500f7ef43166bfc0d65552b0ca5362789c5c82a7217e09362fd5fe  dahdi-zaphfc.patch
@@ -94,8 +90,4 @@ f18043fd18a05be7e49daa9d8c96c8a8c45936b14e82e30523e4d88b1620a73147f765d24d2038c4
 8068fcbba81b819bbd14a1a324457d0febd5350d16c6443be035c50f7759010376bd92d3c7ea69b47309e02603e587387b643f64663652e162853515371a6da5  zaphfc-dahdi-2.4.0.patch
 95811d56f5567bbab1e6fac89fdc7a4d78252a54a416e884903ae2709f8922f5cd02c492de0bad5c35fdfd52250ec231ed11457e36ba33f8747c3226491882de  zaphfc-dahdi-2.5.0.patch
 7533c640817f71789c922bb9a5a3b6132b5b47958770929b1c9a50a1e2e6de914e278f466a85ef99759e291e5907c56d60926c74075f4e731a9910a46c1be3ea  zaphfc-dahdi-2.6.0.patch
-daca74da31c655265164a854987d45ca5ee3af1defbe2d49a9f1a70a48a43dc2bc3ceba724781ae29e3a9078b827f641d2e29809fb25101986f2f69c767d1382  zaphfc-dahdi-2.7.0.patch
-dfc2b0357dc3d2a37c45f1fcc503009cf35e99c8b174d0dd7c91ac4c2c9bb3428f9a19a3f264446069fd751441833f43e11b3b55a060865c6daca9bef74008be  linux-3.13.patch
-18cc299c9b9ab05b93769c0aa68595d3b3b640b97c6ee546b9cbe551f08679557c7e2a5a8255577ab6ae7036c2210550b45066b03d04ebbe7adad1a59aba5866  linux-4.4.patch
-1ce44a927607e04013f03af7655687098397b68c0e857beb5b4d6ae09e92cac59974fd69b5be6bf6d2e4d8e5643f2ce54d9e05661da656d943b5f30c4696ef41  linux-4.11.patch
-ded7386794abad54fb9f7106e4dc0cc62da1a6b32baaed35a15820f935fe65128e9639bf27eaca392fec0750fd0ee13dbb0cbbf95b8d749085d491361a2b3da2  linux-4.13.patch"
+daca74da31c655265164a854987d45ca5ee3af1defbe2d49a9f1a70a48a43dc2bc3ceba724781ae29e3a9078b827f641d2e29809fb25101986f2f69c767d1382  zaphfc-dahdi-2.7.0.patch"
diff --git a/main/dahdi-linux-vanilla/linux-3.13.patch b/main/dahdi-linux-vanilla/linux-3.13.patch
deleted file mode 100644
index 220568995f..0000000000
--- a/main/dahdi-linux-vanilla/linux-3.13.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/drivers/dahdi/zaphfc.c b/drivers/dahdi/zaphfc.c
-index 0402b90..eb56f88 100644
---- a/drivers/dahdi/zaphfc.c
-+++ b/drivers/dahdi/zaphfc.c
-@@ -26,6 +26,7 @@
- #include <linux/init.h>
- #include <linux/interrupt.h>
- #include <linux/delay.h>
-+#include <linux/sched.h>
- #include <dahdi/kernel.h>
- #include "zaphfc.h"
- 
diff --git a/main/dahdi-linux-vanilla/linux-4.11.patch b/main/dahdi-linux-vanilla/linux-4.11.patch
deleted file mode 100644
index 2a8cb60ced..0000000000
--- a/main/dahdi-linux-vanilla/linux-4.11.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -ur dahdi-linux-2.11.1/drivers/dahdi/dahdi-base.c dahdi-linux-2.11.1-4.11/drivers/dahdi/dahdi-base.c
---- dahdi-linux-2.11.1/drivers/dahdi/dahdi-base.c	2016-03-01 23:03:59.000000000 +0100
-+++ dahdi-linux-2.11.1-4.11/drivers/dahdi/dahdi-base.c	2017-05-09 20:34:45.170079849 +0200
-@@ -47,6 +47,9 @@
- #include <linux/kmod.h>
- #include <linux/moduleparam.h>
- #include <linux/sched.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
-+#include <linux/sched/signal.h>
-+#endif
- #include <linux/list.h>
- #include <linux/delay.h>
- #include <linux/mutex.h>
-diff -ur dahdi-linux-2.11.1/drivers/dahdi/dahdi_dynamic.c dahdi-linux-2.11.1-4.11/drivers/dahdi/dahdi_dynamic.c
---- dahdi-linux-2.11.1/drivers/dahdi/dahdi_dynamic.c	2016-03-01 23:03:59.000000000 +0100
-+++ dahdi-linux-2.11.1-4.11/drivers/dahdi/dahdi_dynamic.c	2017-05-09 20:38:03.809649973 +0200
-@@ -467,7 +467,11 @@
- 
- 	/* We shouldn't have more than the two references at this point.  If
- 	 * we do, there are probably channels that are still opened. */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)
- 	if (atomic_read(&d->kref.refcount) > 2) {
-+#else
-+	if (kref_read(&d->kref) > 2) {
-+#endif
- 		dynamic_put(d);
- 		return -EBUSY;
- 	}
-diff -ur dahdi-linux-2.11.1/drivers/dahdi/wcaxx-base.c dahdi-linux-2.11.1-4.11/drivers/dahdi/wcaxx-base.c
---- dahdi-linux-2.11.1/drivers/dahdi/wcaxx-base.c	2016-03-01 23:03:59.000000000 +0100
-+++ dahdi-linux-2.11.1-4.11/drivers/dahdi/wcaxx-base.c	2017-05-09 20:39:05.690553708 +0200
-@@ -28,6 +28,9 @@
- #include <linux/init.h>
- #include <linux/pci.h>
- #include <linux/sched.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
-+#include <linux/sched/signal.h>
-+#endif
- #include <linux/workqueue.h>
- #include <linux/delay.h>
- #include <linux/moduleparam.h>
-diff -ur dahdi-linux-2.11.1/drivers/dahdi/wctc4xxp/base.c dahdi-linux-2.11.1-4.11/drivers/dahdi/wctc4xxp/base.c
---- dahdi-linux-2.11.1/drivers/dahdi/wctc4xxp/base.c	2016-03-01 23:03:59.000000000 +0100
-+++ dahdi-linux-2.11.1-4.11/drivers/dahdi/wctc4xxp/base.c	2017-05-09 20:40:14.041864392 +0200
-@@ -26,6 +26,10 @@
- #include <linux/slab.h>
- #include <linux/kmod.h>
- #include <linux/sched.h>
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
-+#include <linux/sched/signal.h>
-+#endif
- #include <linux/pci.h>
- #include <linux/interrupt.h>
- #include <linux/delay.h>
-diff -ur dahdi-linux-2.11.1/drivers/dahdi/wctdm24xxp/base.c dahdi-linux-2.11.1-4.11/drivers/dahdi/wctdm24xxp/base.c
---- dahdi-linux-2.11.1/drivers/dahdi/wctdm24xxp/base.c	2016-03-01 23:03:59.000000000 +0100
-+++ dahdi-linux-2.11.1-4.11/drivers/dahdi/wctdm24xxp/base.c	2017-05-09 20:39:47.343067209 +0200
-@@ -44,6 +44,9 @@
- #include <linux/init.h>
- #include <linux/pci.h>
- #include <linux/sched.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
-+#include <linux/sched/signal.h>
-+#endif
- #include <linux/interrupt.h>
- #include <linux/workqueue.h>
- #include <linux/delay.h>
-diff -ur dahdi-linux-2.11.1/drivers/dahdi/wcte12xp/base.c dahdi-linux-2.11.1-4.11/drivers/dahdi/wcte12xp/base.c
---- dahdi-linux-2.11.1/drivers/dahdi/wcte12xp/base.c	2016-03-01 23:03:59.000000000 +0100
-+++ dahdi-linux-2.11.1-4.11/drivers/dahdi/wcte12xp/base.c	2017-05-09 20:40:31.216160114 +0200
-@@ -40,6 +40,10 @@
- #include <linux/workqueue.h>
- #include <linux/delay.h>
- #include <linux/sched.h>
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
-+#include <linux/sched/signal.h>
-+#endif
- #include <linux/slab.h>
- 
- #include <stdbool.h>
-diff -ur dahdi-linux-2.11.1/drivers/dahdi/wcte43x-base.c dahdi-linux-2.11.1-4.11/drivers/dahdi/wcte43x-base.c
---- dahdi-linux-2.11.1/drivers/dahdi/wcte43x-base.c	2016-03-01 23:03:59.000000000 +0100
-+++ dahdi-linux-2.11.1-4.11/drivers/dahdi/wcte43x-base.c	2017-05-09 20:38:38.996830549 +0200
-@@ -33,6 +33,10 @@
- #include <linux/workqueue.h>
- #include <linux/delay.h>
- #include <linux/sched.h>
-+#include <linux/version.h>
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,11,0)
-+#include <linux/sched/signal.h>
-+#endif
- #include <linux/crc32.h>
- #include <linux/slab.h>
- 
-diff -ur dahdi-linux-2.11.1/drivers/dahdi/xpp/xbus-core.c dahdi-linux-2.11.1-4.11/drivers/dahdi/xpp/xbus-core.c
---- dahdi-linux-2.11.1/drivers/dahdi/xpp/xbus-core.c	2016-03-01 23:03:59.000000000 +0100
-+++ dahdi-linux-2.11.1-4.11/drivers/dahdi/xpp/xbus-core.c	2017-05-09 20:41:27.973007253 +0200
-@@ -244,7 +244,11 @@
- {
- 	struct kref *kref = &xbus->kref;
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)
- 	return atomic_read(&kref->refcount);
-+#else
-+	return kref_read(kref);
-+#endif
- }
- 
- /*------------------------- Frame  Handling ------------------------*/
-diff -ur dahdi-linux-2.11.1/drivers/dahdi/xpp/xbus-sysfs.c dahdi-linux-2.11.1-4.11/drivers/dahdi/xpp/xbus-sysfs.c
---- dahdi-linux-2.11.1/drivers/dahdi/xpp/xbus-sysfs.c	2016-03-01 23:03:59.000000000 +0100
-+++ dahdi-linux-2.11.1-4.11/drivers/dahdi/xpp/xbus-sysfs.c	2017-05-09 20:42:09.972886067 +0200
-@@ -974,7 +974,11 @@
- 		return;
- 	}
- 	XBUS_DBG(DEVICES, xbus, "going to unregister: refcount=%d\n",
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)
- 		atomic_read(&astribank->kobj.kref.refcount));
-+#else
-+		kref_read(&astribank->kobj.kref));
-+#endif
- 	BUG_ON(dev_get_drvdata(astribank) != xbus);
- 	device_unregister(astribank);
- 	dev_set_drvdata(astribank, NULL);
-diff -ur dahdi-linux-2.11.1/drivers/dahdi/xpp/xpp_dahdi.c dahdi-linux-2.11.1-4.11/drivers/dahdi/xpp/xpp_dahdi.c
---- dahdi-linux-2.11.1/drivers/dahdi/xpp/xpp_dahdi.c	2016-03-01 23:03:59.000000000 +0100
-+++ dahdi-linux-2.11.1-4.11/drivers/dahdi/xpp/xpp_dahdi.c	2017-05-09 20:42:55.336485638 +0200
-@@ -124,7 +124,11 @@
- {
- 	struct kref *kref = &xpd->kref;
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,11,0)
- 	return atomic_read(&kref->refcount);
-+#else
-+	return kref_read(kref);
-+#endif
- }
- 
- xpd_t *get_xpd(const char *msg, xpd_t *xpd)
diff --git a/main/dahdi-linux-vanilla/linux-4.13.patch b/main/dahdi-linux-vanilla/linux-4.13.patch
deleted file mode 100644
index 824e880a3e..0000000000
--- a/main/dahdi-linux-vanilla/linux-4.13.patch
+++ /dev/null
@@ -1,299 +0,0 @@
-Index: dahdi-linux-2.11.1~dfsg/drivers/dahdi/dahdi-sysfs.c
-===================================================================
---- dahdi-linux-2.11.1~dfsg.orig/drivers/dahdi/dahdi-sysfs.c
-+++ dahdi-linux-2.11.1~dfsg/drivers/dahdi/dahdi-sysfs.c
-@@ -214,6 +214,7 @@ static BUS_ATTR_READER(linecompat_show,
- 	return len;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
- static struct device_attribute span_dev_attrs[] = {
- 	__ATTR_RO(name),
- 	__ATTR_RO(desc),
-@@ -230,6 +231,39 @@ static struct device_attribute span_dev_
- 	__ATTR_RO(linecompat),
- 	__ATTR_NULL,
- };
-+#else
-+static DEVICE_ATTR_RO(name);
-+static DEVICE_ATTR_RO(desc);
-+static DEVICE_ATTR_RO(spantype);
-+static DEVICE_ATTR_RO(local_spanno);
-+static DEVICE_ATTR_RO(alarms);
-+static DEVICE_ATTR_RO(lbo);
-+static DEVICE_ATTR_RO(syncsrc);
-+static DEVICE_ATTR_RO(is_digital);
-+static DEVICE_ATTR_RO(is_sync_master);
-+static DEVICE_ATTR_RO(basechan);
-+static DEVICE_ATTR_RO(channels);
-+static DEVICE_ATTR_RO(lineconfig);
-+static DEVICE_ATTR_RO(linecompat);
-+
-+static struct attribute *span_dev_attrs[] = {
-+	&dev_attr_name.attr,
-+	&dev_attr_desc.attr,
-+	&dev_attr_spantype.attr,
-+	&dev_attr_local_spanno.attr,
-+	&dev_attr_alarms.attr,
-+	&dev_attr_lbo.attr,
-+	&dev_attr_syncsrc.attr,
-+	&dev_attr_is_digital.attr,
-+	&dev_attr_is_sync_master.attr,
-+	&dev_attr_basechan.attr,
-+	&dev_attr_channels.attr,
-+	&dev_attr_lineconfig.attr,
-+	&dev_attr_linecompat.attr,
-+	NULL,
-+};
-+ATTRIBUTE_GROUPS(span_dev);
-+#endif
- 
- static ssize_t master_span_show(struct device_driver *driver, char *buf)
- {
-@@ -270,10 +304,11 @@ static struct bus_type spans_bus_type =
- 	.name           = "dahdi_spans",
- 	.match          = span_match,
- 	.uevent         = span_uevent,
--	.dev_attrs	= span_dev_attrs,
- #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-+	.dev_attrs	= span_dev_attrs,
- 	.drv_attrs	= dahdi_attrs,
- #else
-+	.dev_groups	= span_dev_groups,
- 	.drv_groups 	= dahdi_groups,
- #endif
- };
-@@ -690,6 +725,7 @@ dahdi_registration_time_show(struct devi
- 	return count;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
- static struct device_attribute dahdi_device_attrs[] = {
- 	__ATTR(manufacturer, S_IRUGO, dahdi_device_manufacturer_show, NULL),
- 	__ATTR(type, S_IRUGO, dahdi_device_type_show, NULL),
-@@ -704,11 +740,48 @@ static struct device_attribute dahdi_dev
- 	__ATTR(registration_time, S_IRUGO, dahdi_registration_time_show, NULL),
- 	__ATTR_NULL,
- };
-+#else
-+static DEVICE_ATTR(manufacturer, S_IRUGO, dahdi_device_manufacturer_show, NULL);
-+static DEVICE_ATTR(type, S_IRUGO, dahdi_device_type_show, NULL);
-+static DEVICE_ATTR(span_count, S_IRUGO, dahdi_device_span_count_show, NULL);
-+static DEVICE_ATTR(hardware_id, S_IRUGO, dahdi_device_hardware_id_show, NULL);
-+static DEVICE_ATTR(location, S_IRUGO, dahdi_device_location_show, NULL);
-+static DEVICE_ATTR(auto_assign, S_IWUSR, NULL, dahdi_device_auto_assign);
-+static DEVICE_ATTR(assign_span, S_IWUSR, NULL, dahdi_device_assign_span);
-+static DEVICE_ATTR(unassign_span, S_IWUSR, NULL, dahdi_device_unassign_span);
-+/*
-+ * Using DEVICE_ATTR for spantype attribute here will conflict with the
-+ * span device attribute definition above. Define it somewhat more
-+ * manually to give it a unique name.
-+ */
-+static struct device_attribute dahdi_dev_attr_spantype =
-+	__ATTR(spantype, S_IWUSR | S_IRUGO, dahdi_spantype_show, dahdi_spantype_store);
-+static DEVICE_ATTR(registration_time, S_IRUGO, dahdi_registration_time_show, NULL);
-+
-+static struct attribute *dahdi_device_attrs[] = {
-+	&dev_attr_manufacturer.attr,
-+	&dev_attr_type.attr,
-+	&dev_attr_span_count.attr,
-+	&dev_attr_hardware_id.attr,
-+	&dev_attr_location.attr,
-+	&dev_attr_auto_assign.attr,
-+	&dev_attr_assign_span.attr,
-+	&dev_attr_unassign_span.attr,
-+	&dahdi_dev_attr_spantype.attr,
-+	&dev_attr_registration_time.attr,
-+	NULL,
-+};
-+ATTRIBUTE_GROUPS(dahdi_device);
-+#endif
- 
- static struct bus_type dahdi_device_bus = {
- 	.name = "dahdi_devices",
- 	.uevent         = device_uevent,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
- 	.dev_attrs = dahdi_device_attrs,
-+#else
-+	.dev_groups = dahdi_device_groups,
-+#endif
- };
- 
- static void dahdi_sysfs_cleanup(void)
-Index: dahdi-linux-2.11.1~dfsg/drivers/dahdi/dahdi-sysfs-chan.c
-===================================================================
---- dahdi-linux-2.11.1~dfsg.orig/drivers/dahdi/dahdi-sysfs-chan.c
-+++ dahdi-linux-2.11.1~dfsg/drivers/dahdi/dahdi-sysfs-chan.c
-@@ -158,6 +158,7 @@ static BUS_ATTR_READER(ec_state_show, de
- 	return len;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
- static struct device_attribute chan_dev_attrs[] = {
- 	__ATTR_RO(name),
- 	__ATTR_RO(channo),
-@@ -174,6 +175,39 @@ static struct device_attribute chan_dev_
- 	__ATTR_RO(in_use),
- 	__ATTR_NULL,
- };
-+#else
-+static DEVICE_ATTR_RO(name);
-+static DEVICE_ATTR_RO(channo);
-+static DEVICE_ATTR_RO(chanpos);
-+static DEVICE_ATTR_RO(sig);
-+static DEVICE_ATTR_RO(sigcap);
-+static DEVICE_ATTR_RO(alarms);
-+static DEVICE_ATTR_RO(ec_factory);
-+static DEVICE_ATTR_RO(ec_state);
-+static DEVICE_ATTR_RO(blocksize);
-+#ifdef OPTIMIZE_CHANMUTE
-+static DEVICE_ATTR_RO(chanmute);
-+#endif
-+static DEVICE_ATTR_RO(in_use);
-+
-+static struct attribute *chan_dev_attrs[] = {
-+	&dev_attr_name.attr,
-+	&dev_attr_channo.attr,
-+	&dev_attr_chanpos.attr,
-+	&dev_attr_sig.attr,
-+	&dev_attr_sigcap.attr,
-+	&dev_attr_alarms.attr,
-+	&dev_attr_ec_factory.attr,
-+	&dev_attr_ec_state.attr,
-+	&dev_attr_blocksize.attr,
-+#ifdef OPTIMIZE_CHANMUTE
-+	&dev_attr_chanmute.attr,
-+#endif
-+	&dev_attr_in_use.attr,
-+	NULL,
-+};
-+ATTRIBUTE_GROUPS(chan_dev);
-+#endif
- 
- static void chan_release(struct device *dev)
- {
-@@ -196,7 +230,11 @@ static int chan_match(struct device *dev
- static struct bus_type chan_bus_type = {
- 	.name		= "dahdi_channels",
- 	.match		= chan_match,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
- 	.dev_attrs	= chan_dev_attrs,
-+#else
-+	.dev_groups     = chan_dev_groups,
-+#endif
- };
- 
- static int chan_probe(struct device *dev)
-Index: dahdi-linux-2.11.1~dfsg/drivers/dahdi/xpp/xbus-sysfs.c
-===================================================================
---- dahdi-linux-2.11.1~dfsg.orig/drivers/dahdi/xpp/xbus-sysfs.c
-+++ dahdi-linux-2.11.1~dfsg/drivers/dahdi/xpp/xbus-sysfs.c
-@@ -339,6 +339,7 @@ static DEVICE_ATTR_READER(dahdi_registra
- 	return len;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
- static struct device_attribute xbus_dev_attrs[] = {
- 	__ATTR_RO(connector),
- 	__ATTR_RO(label),
-@@ -358,6 +359,42 @@ static struct device_attribute xbus_dev_
- 		dahdi_registration_store),
- 	__ATTR_NULL,
- };
-+#else
-+static DEVICE_ATTR_RO(connector);
-+static DEVICE_ATTR_RO(label);
-+static DEVICE_ATTR_RO(status);
-+static DEVICE_ATTR_RO(timing);
-+static DEVICE_ATTR_RO(refcount_xbus);
-+static DEVICE_ATTR_RO(waitfor_xpds);
-+static DEVICE_ATTR_RO(driftinfo);
-+static DEVICE_ATTR(cls, S_IWUSR, NULL, cls_store);
-+static DEVICE_ATTR(xbus_state, S_IRUGO | S_IWUSR, xbus_state_show,
-+		   xbus_state_store);
-+#ifdef	SAMPLE_TICKS
-+static DEVICE_ATTR(samples, S_IWUSR | S_IRUGO, samples_show, samples_store);
-+#endif
-+static DEVICE_ATTR(dahdi_registration, S_IRUGO | S_IWUSR,
-+		   dahdi_registration_show,
-+		   dahdi_registration_store);
-+
-+static struct attribute *xbus_dev_attrs[] = {
-+	&dev_attr_connector.attr,
-+	&dev_attr_label.attr,
-+	&dev_attr_status.attr,
-+	&dev_attr_timing.attr,
-+	&dev_attr_refcount_xbus.attr,
-+	&dev_attr_waitfor_xpds.attr,
-+	&dev_attr_driftinfo.attr,
-+	&dev_attr_cls.attr,
-+	&dev_attr_xbus_state.attr,
-+#ifdef	SAMPLE_TICKS
-+	&dev_attr_samples.attr,
-+#endif
-+	&dev_attr_dahdi_registration.attr,
-+	NULL,
-+};
-+ATTRIBUTE_GROUPS(xbus_dev);
-+#endif
- 
- static int astribank_match(struct device *dev, struct device_driver *driver)
- {
-@@ -457,10 +494,11 @@ static struct bus_type toplevel_bus_type
- 	.name = "astribanks",
- 	.match = astribank_match,
- 	.uevent = astribank_uevent,
--	.dev_attrs = xbus_dev_attrs,
- #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
-+	.dev_attrs = xbus_dev_attrs,
- 	.drv_attrs = xpp_attrs,
- #else
-+	.dev_groups = xbus_dev_groups,
- 	.drv_groups = xpp_groups,
- #endif
- };
-@@ -744,6 +782,7 @@ static int xpd_match(struct device *dev,
- 	return 1;
- }
- 
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
- static struct device_attribute xpd_dev_attrs[] = {
- 	__ATTR(chipregs, S_IRUGO | S_IWUSR, chipregs_show, chipregs_store),
- 	__ATTR(blink, S_IRUGO | S_IWUSR, blink_show, blink_store),
-@@ -754,11 +793,36 @@ static struct device_attribute xpd_dev_a
- 	__ATTR_RO(refcount_xpd),
- 	__ATTR_NULL,
- };
-+#else
-+DEVICE_ATTR(chipregs, S_IRUGO | S_IWUSR, chipregs_show, chipregs_store);
-+DEVICE_ATTR(blink, S_IRUGO | S_IWUSR, blink_show, blink_store);
-+DEVICE_ATTR(span, S_IRUGO | S_IWUSR, span_show, span_store);
-+DEVICE_ATTR_RO(type);
-+DEVICE_ATTR_RO(offhook);
-+DEVICE_ATTR_RO(timing_priority);
-+DEVICE_ATTR_RO(refcount_xpd);
-+
-+static struct attribute *xpd_dev_attrs[] = {
-+	&dev_attr_chipregs.attr,
-+	&dev_attr_blink.attr,
-+	&dev_attr_span.attr,
-+	&dev_attr_type.attr,
-+	&dev_attr_offhook.attr,
-+	&dev_attr_timing_priority.attr,
-+	&dev_attr_refcount_xpd.attr,
-+	NULL,
-+};
-+ATTRIBUTE_GROUPS(xpd_dev);
-+#endif
- 
- static struct bus_type xpd_type = {
- 	.name = "xpds",
- 	.match = xpd_match,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0)
- 	.dev_attrs = xpd_dev_attrs,
-+#else
-+	.dev_groups = xpd_dev_groups,
-+#endif
- };
- 
- int xpd_driver_register(struct device_driver *driver)
diff --git a/main/dahdi-linux-vanilla/linux-4.4.patch b/main/dahdi-linux-vanilla/linux-4.4.patch
deleted file mode 100644
index fe6105319d..0000000000
--- a/main/dahdi-linux-vanilla/linux-4.4.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./drivers/dahdi/zaphfc.c.orig
-+++ ./drivers/dahdi/zaphfc.c
-@@ -27,6 +27,7 @@
- #include <linux/interrupt.h>
- #include <linux/delay.h>
- #include <linux/sched.h>
-+#include <linux/vmalloc.h>
- #include <dahdi/kernel.h>
- #include "zaphfc.h"
-