The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=86869d77658aef48b2bab3e57517f88d7bd5389d
commit 86869d77658aef48b2bab3e57517f88d7bd5389d Author: Kevin Bowling <[email protected]> AuthorDate: 2026-07-28 11:21:37 +0000 Commit: Kevin Bowling <[email protected]> CommitDate: 2026-07-31 11:57:44 +0000 ixgbe: avoid signed shift when assembling ETrack ID Obtained from: Intel ix 3.4.39 MFC after: 1 week --- 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 ab763595f0b5..a3659cce50c4 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; } }
