git: e1bc42cb1551 - main - e1000: fix/complete merge of previous two commits

The branch main has been updated by jmg:

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

commit e1bc42cb1551ca2a18ef60c38247fb5dc2509ea2
Author:     John-Mark Gurney <jmg@FreeBSD.org>
AuthorDate: 2025-09-15 21:29:11 +0000
Commit:     John-Mark Gurney <jmg@FreeBSD.org>
CommitDate: 2025-09-15 21:43:54 +0000

    e1000: fix/complete merge of previous two commits
    
    When fixing the conflicts caused by gallatin's commit and the reviewed
    patch, I missed this location because it didn't exist when gallatin did
    their change.
    
    Obtained from: Juniper Networks, Inc.
---
 sys/dev/e1000/if_em.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c
index 20df466b4e76..247cf9d7fed3 100644
--- a/sys/dev/e1000/if_em.c
+++ b/sys/dev/e1000/if_em.c
@@ -4815,7 +4815,8 @@ em_if_get_vf_counter(if_ctx_t ctx, ift_counter cnt)
 	case IFCOUNTER_IERRORS:
 		return sc->dropped_pkts;
 	case IFCOUNTER_OERRORS:
-		return sc->watchdog_events;
+		return (if_get_counter_default(ifp, cnt) +
+		    sc->watchdog_events);
 	default:
 		return (if_get_counter_default(ifp, cnt));
 	}