kernel: fix trans_start usage again

It turns out that trans_start (see 7499f529) was deprecated in RHEL kernel versions earlier than in mainstream. This adds logic to take care of all cases.

kernel: fix trans_start usage again
It turns out that trans_start (see 7499f529) was deprecated in RHEL kernel versions earlier than in mainstream. This adds logic to take care of all cases.
481b8821 · Juan David González Cobas · Federico Vaga · 10d3cd7b · 481b8821
Commit 481b8821 authored Oct 09, 2017 by Juan David González Cobas Committed by Federico Vaga Oct 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 5 deletions

nic-core.c kernel/wr_nic/nic-core.c +18 -5

No files found.
--- a/kernel/wr_nic/nic-core.c
+++ b/kernel/wr_nic/nic-core.c
@@ -23,6 +23,22 @@
 #include "wr-nic.h"
 #include "nic-mem.h"
+#undef WRN_TRANS_UPDATE
+#if KERNEL_VERSION(4, 7, 0) <= LINUX_VERSION_CODE
+#define WRN_TRANS_UPDATE
+#endif
+#ifdef RHEL_RELEASE_VERSION
+#if RHEL_RELEASE_VERSION(7, 0) <= RHEL_RELEASE_CODE
+#define WRN_TRANS_UPDATE
+#endif
+#endif
+#ifdef WRN_TRANS_UPDATE
+#define trans_update(dev)	netif_trans_update(dev)
+#else
+#define trans_update(dev)	((dev)->trans_start = jiffies)
+#endif
 /*
 * The following functions are the standard network device operations.
 * They act on the _endpoint_ (as each Linux interface is one endpoint)
@@ -210,11 +226,8 @@ static int wrn_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	/* We are done, this is trivial maiintainance*/
 	ep->stats.tx_packets++;
 	ep->stats.tx_bytes += len;
-#if KERNEL_VERSION(4, 7, 0) > LINUX_VERSION_CODE
+	trans_update(dev);
-	dev->trans_start = jiffies;
-#else
-	netif_trans_update(dev);
-#endif
 	//spin_unlock_irqrestore(&ep->lock, flags);
 	return 0;
 }