mirror of
https://github.com/AllStarLink/dahdi-linux.git
synced 2026-08-26 14:27:35 -04:00
Merge pull request #2 from AllStarLink/post_3_4_0
backport upstream patches for linux 6.11 builds
This commit is contained in:
Jason McCormick
GitHub
commit
74db2f252b
5 changed files with 117 additions and 1 deletions
2
Makefile
2
Makefile
|
|
@ -1,6 +1,6 @@
|
|||
EPOCHVER = 1:
|
||||
RELVER = 3.4.0
|
||||
DEBVER = 5+asl
|
||||
DEBVER = 6+asl
|
||||
PKGNAME = dahdi-linux
|
||||
ifndef ${RELPLAT}
|
||||
RELPLAT = deb$(shell lsb_release -rs 2> /dev/null)
|
||||
|
|
|
|||
6
debian/changelog
vendored
6
debian/changelog
vendored
|
|
@ -1,3 +1,9 @@
|
|||
dahdi-linux (1:3.4.0-6+asl) unstable; urgency=medium
|
||||
|
||||
* Backport PRs 64, 66 for kernel 6.11 support
|
||||
|
||||
-- Jason McCormick <jason@mfamily.org> Fri, 17 Jan 2025 18:06:53 -0500
|
||||
|
||||
dahdi-linux (1:3.4.0-5+asl) unstable; urgency=medium
|
||||
|
||||
* Remove BUILD_EXCLUSIVE_CONFIG for PCI/USB
|
||||
|
|
|
|||
32
debian/patches/66_empty_if
vendored
Normal file
32
debian/patches/66_empty_if
vendored
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
From a1f6aa718e587481a3998642aed7a1246f114583 Mon Sep 17 00:00:00 2001
|
||||
From: InterLinked1 <24227567+InterLinked1@users.noreply.github.com>
|
||||
Date: Mon, 23 Sep 2024 19:14:44 -0400
|
||||
Subject: [PATCH] xpp: Add braces around empty if statements.
|
||||
|
||||
Avoid compilation failure on modern kernels by adding braces
|
||||
around empty if body.
|
||||
|
||||
Resolves: #65
|
||||
---
|
||||
drivers/dahdi/xpp/card_fxs.c | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/dahdi/xpp/card_fxs.c b/drivers/dahdi/xpp/card_fxs.c
|
||||
index bb1c169f3..d4383aa4e 100644
|
||||
--- a/drivers/dahdi/xpp/card_fxs.c
|
||||
+++ b/drivers/dahdi/xpp/card_fxs.c
|
||||
@@ -1169,10 +1169,12 @@ static int set_vmwi(xpd_t *xpd, int pos, unsigned long arg)
|
||||
"%s: VMWI(hvdc) is not implemented yet. Ignored.\n",
|
||||
__func__);
|
||||
}
|
||||
- if (VMWI_TYPE(priv, pos, HVAC))
|
||||
+ if (VMWI_TYPE(priv, pos, HVAC)) {
|
||||
; /* VMWI_NEON */
|
||||
- if (priv->vmwisetting[pos].vmwi_type == 0)
|
||||
+ }
|
||||
+ if (priv->vmwisetting[pos].vmwi_type == 0) {
|
||||
; /* Disable VMWI */
|
||||
+ }
|
||||
priv->vmwisetting[pos] = vmwisetting;
|
||||
set_vm_led_mode(xpd->xbus, xpd, pos, PHONEDEV(xpd).msg_waiting[pos]);
|
||||
return 0;
|
||||
76
debian/patches/kernel_6_11_sysfs
vendored
Normal file
76
debian/patches/kernel_6_11_sysfs
vendored
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
From ce9de5d1bf9d21c088b01ce9da6f7ff02b0d863d Mon Sep 17 00:00:00 2001
|
||||
From: InterLinked1 <24227567+InterLinked1@users.noreply.github.com>
|
||||
Date: Mon, 23 Sep 2024 08:04:54 -0400
|
||||
Subject: [PATCH] xpp, sysfs: Use const struct device_device if needed.
|
||||
|
||||
Kernel commit d69d804845985c29ab5be5a4b3b1f4787893daf8
|
||||
changed struct device_driver to be const, so make the
|
||||
arguments const on kernels 6.11 and newer.
|
||||
|
||||
Resolves: #63
|
||||
---
|
||||
drivers/dahdi/dahdi-sysfs-chan.c | 4 ++++
|
||||
drivers/dahdi/dahdi-sysfs.c | 4 ++++
|
||||
drivers/dahdi/xpp/xbus-sysfs.c | 8 ++++++++
|
||||
3 files changed, 16 insertions(+)
|
||||
|
||||
diff --git a/drivers/dahdi/dahdi-sysfs-chan.c b/drivers/dahdi/dahdi-sysfs-chan.c
|
||||
index 09d73172..35b7bd41 100644
|
||||
--- a/drivers/dahdi/dahdi-sysfs-chan.c
|
||||
+++ b/drivers/dahdi/dahdi-sysfs-chan.c
|
||||
@@ -220,7 +220,11 @@ static void chan_release(struct device *dev)
|
||||
chan_dbg(DEVICES, chan, "SYSFS\n");
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0)
|
||||
+static int chan_match(struct device *dev, const struct device_driver *driver)
|
||||
+#else
|
||||
static int chan_match(struct device *dev, struct device_driver *driver)
|
||||
+#endif /* LINUX_VERSION_CODE */
|
||||
{
|
||||
struct dahdi_chan *chan;
|
||||
|
||||
diff --git a/drivers/dahdi/dahdi-sysfs.c b/drivers/dahdi/dahdi-sysfs.c
|
||||
index 7477ebc9..246514cc 100644
|
||||
--- a/drivers/dahdi/dahdi-sysfs.c
|
||||
+++ b/drivers/dahdi/dahdi-sysfs.c
|
||||
@@ -42,7 +42,11 @@ module_param(tools_rootdir, charp, 0444);
|
||||
MODULE_PARM_DESC(tools_rootdir,
|
||||
"root directory of all tools paths (default /)");
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0)
|
||||
+static int span_match(struct device *dev, const struct device_driver *driver)
|
||||
+#else
|
||||
static int span_match(struct device *dev, struct device_driver *driver)
|
||||
+#endif /* LINUX_VERSION_CODE */
|
||||
{
|
||||
return 1;
|
||||
}
|
||||
diff --git a/drivers/dahdi/xpp/xbus-sysfs.c b/drivers/dahdi/xpp/xbus-sysfs.c
|
||||
index 177048b2..f78a15ec 100644
|
||||
--- a/drivers/dahdi/xpp/xbus-sysfs.c
|
||||
+++ b/drivers/dahdi/xpp/xbus-sysfs.c
|
||||
@@ -397,7 +397,11 @@ static struct attribute *xbus_dev_attrs[] = {
|
||||
ATTRIBUTE_GROUPS(xbus_dev);
|
||||
#endif
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0)
|
||||
+static int astribank_match(struct device *dev, const struct device_driver *driver)
|
||||
+#else
|
||||
static int astribank_match(struct device *dev, struct device_driver *driver)
|
||||
+#endif /* LINUX_VERSION_CODE */
|
||||
{
|
||||
DBG(DEVICES, "SYSFS MATCH: dev->bus_id = %s, driver->name = %s\n",
|
||||
dev_name(dev), driver->name);
|
||||
@@ -771,7 +775,11 @@ static DEVICE_ATTR_READER(refcount_xpd_show, dev, buf)
|
||||
return len;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 11, 0)
|
||||
+static int xpd_match(struct device *dev, const struct device_driver *driver)
|
||||
+#else
|
||||
static int xpd_match(struct device *dev, struct device_driver *driver)
|
||||
+#endif /* LINUX_VERSION_CODE */
|
||||
{
|
||||
struct xpd_driver *xpd_driver;
|
||||
xpd_t *xpd;
|
||||
2
debian/patches/series
vendored
2
debian/patches/series
vendored
|
|
@ -2,3 +2,5 @@
|
|||
no_firmware_download
|
||||
minimize-modules
|
||||
autop_vox
|
||||
kernel_6_11_sysfs
|
||||
66_empty_if
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue