git: 6452e39b45c3 - stable/15 - ixgbe: avoid signed shift when assembling ETrack ID

Kevin Bowling <[email protected]>
Newsgroups gmane.os.freebsd.devel.cvs.src
Message-ID <6a767a85.3dd65.60d1bcd2__49461.2900352635$1786149645$gmane$org@gitrepo.freebsd.org>
The branch stable/15 has been updated by kbowling:

URL: https://cgit.FreeBSD.org/src/commit/?id=6452e39b45c3cf0dcfccd0432948f12fcb99396a

commit 6452e39b45c3cf0dcfccd0432948f12fcb99396a
Author:     Kevin Bowling <[email protected]>
AuthorDate: 2026-07-28 11:21:37 +0000
Commit:     Kevin Bowling <[email protected]>
CommitDate: 2026-08-08 00:37:02 +0000

    ixgbe: avoid signed shift when assembling ETrack ID
    
    Obtained from:  Intel ix 3.4.39
    
    (cherry picked from commit 86869d77658aef48b2bab3e57517f88d7bd5389d)
---
 sys/dev/ixgbe/ixgbe_common.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/dev/ixgbe/ixgbe_common.c b/sys/dev/ixgbe/ixgbe_common.c
index 439b861a17e9..20c5a13835e0 100644
--- a/sys/dev/ixgbe/ixgbe_common.c
+++ b/sys/dev/ixgbe/ixgbe_common.c
@@ -5454,11 +5454,11 @@ void ixgbe_get_etk_id(struct ixgbe_hw *hw, struct ixgbe_nvm_version *nvm_ver)
 	 * word bit 15.
 	 */
 	if ((etk_id_h & NVM_ETK_VALID) == 0) {
-		nvm_ver->etk_id = etk_id_h;
-		nvm_ver->etk_id |= (etk_id_l << NVM_ETK_SHIFT);
+		nvm_ver->etk_id = (u32)etk_id_h;
+		nvm_ver->etk_id |= (u32)etk_id_l << NVM_ETK_SHIFT;
 	} else {
-		nvm_ver->etk_id = etk_id_l;
-		nvm_ver->etk_id |= (etk_id_h << NVM_ETK_SHIFT);
+		nvm_ver->etk_id = (u32)etk_id_l;
+		nvm_ver->etk_id |= (u32)etk_id_h << NVM_ETK_SHIFT;
 	}
 }
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.