Difference between
modified post 19df1 by Anonymous on Tue 21st Dec 2021 09:33
original post 3e6399f8a by Anonymous on Wed 17th Nov 2021 10:37
Download diff
Show old version | new version | both versions

$ git diff

1		-	$ git diff
	1	+	diff -r -u igb_avb/kmod/igb_ethtool.c igb_avb/kmod/igb_ethtool.c
2		-	diff --git a/kmod/igb_main.c b/kmod/igb_main.c
	2	+	--- igb_avb/kmod/igb_ethtool.c 2021-11-16 08:33:42.829986006 +0100
3		-	old mode 100755
	3	+	+++ igb_avb/kmod/igb_ethtool.c 2021-12-21 10:21:39.807901702 +0100
4		-	new mode 100644
	4	+	@@ -3144,6 +3144,7 @@
10	5
11		-	/* prevent any other reads prior to eop_desc */
	6	+	#endif /* ETHTOOL_SCHANNELS */
12		-	+#if 0
	7	+	static const struct ethtool_ops igb_ethtool_ops = {
13		-	read_barrier_depends();
	8	+	+ .supported_coalesce_params = ETHTOOL_COALESCE_USECS,
14		-	+#else
	9	+	.get_drvinfo = igb_get_drvinfo,
15		-	+ smp_rmb();
	10	+	.get_regs_len = igb_get_regs_len,
16		-	+#endif
	11	+	.get_regs = igb_get_regs,
17		-
	12	+	diff -r -u igb_avb/kmod/igb_main.c igb_avb/kmod/igb_main.c
18		-	/* if DD is not set pending work has not been completed */
	13	+	--- igb_avb/kmod/igb_main.c 2021-11-17 09:30:40.616405653 +0100
19		-	if (!(eop_desc->wb.status & cpu_to_le32(E1000_TXD_STAT_DD)))
	14	+	+++ igb_avb/kmod/igb_main.c 2021-12-21 10:21:39.811901636 +0100
20		-
	15	+	@@ -5566,7 +5566,7 @@
21		-
	16	+	tx_desc->read.olinfo_status = cpu_to_le32(olinfo_status);
22		-
	17	+	}
23	18
24		-
	19	+	-static void igb_tx_map(struct igb_ring *tx_ring,
25		-
	20	+	+static int igb_tx_map(struct igb_ring *tx_ring,
26		-
	21	+	struct igb_tx_buffer *first,
27		-
	22	+	const u8 hdr_len)
28		-
	23	+	{
29		-
	24	+	@@ -5679,7 +5679,7 @@
30		-
	25	+	*/
31		-
	26	+	mmiowb();
32	27
33		-
	28	+	- return;
34		-
	29	+	+ return 0;
35	30
36		-
	31	+	dma_error:
37		-
	32	+	dev_err(tx_ring->dev, "TX DMA map failed\n");
38		-
	33	+	@@ -5696,6 +5696,7 @@
39		-
	34	+	}
40	35
41		-
	36	+	tx_ring->next_to_use = i;
42		-
	37	+	+ return -1;
43		-
	38	+	}
44	39
45		-
	40	+	static int __igb_maybe_stop_tx(struct igb_ring *tx_ring, const u16 size)
46		-
	41	+	@@ -7411,12 +7412,11 @@
47		-
	42	+	break;
48	43
49		-
	44	+	/* prevent any other reads prior to eop_desc */
50		-
	45	+	-#if 0
51		-
	46	+	- read_barrier_depends();
52		-
	47	+	-#else
53		-
	48	+	+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,9,0)
54		-
	49	+	smp_rmb();
55		-
	50	+	+#else
56		-
	51	+	+ read_barrier_depends();
57		-
	52	+	#endif
58		-
	53	+	-
59		-
	54	+	/* if DD is not set pending work has not been completed */
60		-
	55	+	if (!(eop_desc->wb.status & cpu_to_le32(E1000_TXD_STAT_DD)))
61		-
	56	+	break;
62	57
63		-
	58	+	if (!(eop_desc->wb.status & cpu_to_le32(E1000_TXD_STAT_DD)))
64	59