diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c
index d39af9bee7cd..bd267f73af4e 100644
--- a/sys/dev/bce/if_bce.c
+++ b/sys/dev/bce/if_bce.c
@@ -4204,8 +4204,7 @@ bce_init_ctx(struct bce_softc *sc)
 
 	if ((BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5709) ||
 		(BCE_CHIP_NUM(sc) == BCE_CHIP_NUM_5716)) {
-		/* DRC: Replace this constant value with a #define. */
-		int i, retry_cnt = 10;
+		int i, retry_cnt = CTX_INIT_RETRY_COUNT;
 		u32 val;
 
 		DBPRINT(sc, BCE_INFO_CTX, "Initializing 5709 context.\n");
@@ -5895,6 +5894,9 @@ bce_rx_intr(struct bce_softc *sc)
 			/* Set the total packet length. */
 			m0->m_pkthdr.len = m0->m_len = pkt_len;
 		}
+#else
+        /* Set the total packet length. */
+		m0->m_pkthdr.len = m0->m_len = pkt_len;
 #endif
 
 		/* Remove the trailing Ethernet FCS. */
diff --git a/sys/dev/bce/if_bcereg.h b/sys/dev/bce/if_bcereg.h
index 518b4b9cd0ff..32456fde3bfd 100644
--- a/sys/dev/bce/if_bcereg.h
+++ b/sys/dev/bce/if_bcereg.h
@@ -6232,6 +6232,8 @@ struct l2_fhdr {
 
 #endif /* ZERO_COPY_SOCKETS */
 
+#define CTX_INIT_RETRY_COUNT        10
+
 /* Context size. */
 #define CTX_SHIFT                   7
 #define CTX_SIZE                    (1 << CTX_SHIFT)