ice: final upstream version of the fix for RHEL-19000

JIRA: https://issues.redhat.com/browse/RHEL-35969

When we were fixing RHEL-19000 (!3855 (merged)), we were under pressure to deliver the fix in Zstream ASAP. We used an early version of the fix, still under upstream review. The final version of the fix is now merged in net-next and it is slightly different.

Let's backport the differences between the previously backported and the final upstream version of the patchset.

There should be no behavior change.

Signed-off-by: Michal Schmidt mschmidt@redhat.com