File 0001-dahdi-base.c-remove-netdev-trans_start-ker... of Package dahdi-linux

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-dahdi-base.c-remove-netdev-trans_start-kerne-4.7.patch of Package dahdi-linux (Revision 260c6a11481b69c00d0bac35f8575074)

Currently displaying revision 260c6a11481b69c00d0bac35f8575074 , Show latest

From fb04119bd0a262686623f9c95df42d324482e786 Mon Sep 17 00:00:00 2001
From: Harald Welte <laforge@osmocom.org>
Date: Sun, 6 Sep 2020 12:49:24 +0200
Subject: [PATCH 01/10] dahdi-base.c: remove netdev->trans_start (kerne >= 4.7)

In linux kernel commit 4d659fcb20d3d3302b429c889a73a92ff2804b9a
in May 2016, netdev->trans_start was removed and write accesses
are replaced with this helper: netif_trans_update(dev)

This makes dahdi-base.c compile against kernels >= 4.7
when CONFIG_DAHDI_NET is enabled.

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

diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index 5c77cdc..406bb2b 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -2140,7 +2140,11 @@ static int dahdi_xmit(struct sk_buff *skb, struct net_device *dev)
 			   some space for us */
 			ss->outwritebuf = oldbuf;
 		}
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
+		netif_trans_update(dev);
+#else
 		dev->trans_start = jiffies;
+#endif
 		stats->tx_packets++;
 		stats->tx_bytes += ss->writen[oldbuf];
 		print_debug_writebuf(ss, skb, oldbuf);
-- 
2.29.2

Places

File 0001-dahdi-base.c-remove-netdev-trans_start-kerne-4.7.patch of Package dahdi-linux (Revision 260c6a11481b69c00d0bac35f8575074)

Places