File 0001-Fix-build-with-DAHDI_NET-on-kernel-5.15.patch of Package dahdi-linux

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Fix-build-with-DAHDI_NET-on-kernel-5.15.patch of Package dahdi-linux (Revision 260c6a11481b69c00d0bac35f8575074)

Currently displaying revision 260c6a11481b69c00d0bac35f8575074 , Show latest

From b2371828bed2240d1dde3e761539e10772a631d1 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@osmocom.org>
Date: Mon, 29 Nov 2021 09:50:15 +0100
Subject: [PATCH] Fix build with DAHDI_NET on kernel >= 5.15

Ever since commit ad7eab2ab014748b062507b7ac69f8e856057717
"net: split out ndo_siowandev ioctl" has been merged in 5.15-rc1,
DAHDI failed to compile with DAHDI_NET enabled due to slight differences
in handling the HDLC/WAN device related ioctl.

Signed-off-by: Harald Welte <laforge@gnumonks.org>
---
 drivers/dahdi/dahdi-base.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index dd41d27..161a804 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -2156,10 +2156,12 @@ static int dahdi_xmit(struct sk_buff *skb, struct net_device *dev)
 	return retval;
 }
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 15, 0)
 static int dahdi_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
 	return hdlc_ioctl(dev, ifr, cmd);
 }
+#endif /* < 5.15 */
 
 #endif
 
@@ -4786,7 +4788,11 @@ static void recalc_slaves(struct dahdi_chan *chan)
 static const struct net_device_ops dahdi_netdev_ops = {
 	.ndo_open       = dahdi_net_open,
 	.ndo_stop       = dahdi_net_stop,
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0)
+	.ndo_siocwandev	= hdlc_ioctl,
+#else
 	.ndo_do_ioctl   = dahdi_net_ioctl,
+#endif
 	.ndo_start_xmit = hdlc_start_xmit,
 };
 #endif
-- 
2.34.0

Places

File 0001-Fix-build-with-DAHDI_NET-on-kernel-5.15.patch of Package dahdi-linux (Revision 260c6a11481b69c00d0bac35f8575074)

Places