git: 911b3c3aa648 - main - Revert "e1000: Remove redundant EITR shift from igb"

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Kevin Bowling <kbowling_at_FreeBSD.org>
Date: Sat, 28 Sep 2024 09:12:08 UTC

The branch main has been updated by kbowling:

URL: https://cgit.FreeBSD.org/src/commit/?id=911b3c3aa6484709f7a6020f1f25ab24737296ce

commit 911b3c3aa6484709f7a6020f1f25ab24737296ce
Author:     Kevin Bowling <kbowling@FreeBSD.org>
AuthorDate: 2024-09-28 08:47:00 +0000
Commit:     Kevin Bowling <kbowling@FreeBSD.org>
CommitDate: 2024-09-28 09:11:55 +0000

    Revert "e1000: Remove redundant EITR shift from igb"
    
    Turns out this is necessary
    
    This reverts commit 26439b57877ccae7a2404f7d179afaa5ddb2f64d.
---
 sys/dev/e1000/if_em.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/dev/e1000/if_em.h b/sys/dev/e1000/if_em.h
index 83a0d4e96fc6..7219dc57c333 100644
--- a/sys/dev/e1000/if_em.h
+++ b/sys/dev/e1000/if_em.h
@@ -251,7 +251,8 @@
 #define IGB_ITR_DIVIDEND	1000000
 #define IGB_ITR_SHIFT		2
 #define IGB_QVECTOR_MASK	0x7FFC
-#define IGB_INTS_TO_EITR(i)	((IGB_ITR_DIVIDEND/i) & IGB_QVECTOR_MASK)
+#define IGB_INTS_TO_EITR(i)	(((IGB_ITR_DIVIDEND/i) & IGB_QVECTOR_MASK) << \
+				    IGB_ITR_SHIFT)
 
 #define IGB_LINK_ITR		2000
 #define I210_LINK_DELAY		1000