When will the new BCE driver in HEAD be incorporated into RELENG_6?

[Jason Thomson]

Scott Long wrote:
 > Conrad Burger wrote:
 >
 >> Hi
 >>
 >> It looks like there is a "new"  version of the bce driver in HEAD.
 >> When will it be incorporated into  Releng_6?
 >
 >
 > It will be merged when someone, preferably 2-3 people, tell me that
 > the changes in HEAD work for them.  So far, no one has.
 >
 > Scott
 > _______________________________________________

Using the driver from HEAD* in the latest RELENG_6 didn't fix our
problems.

We could still trigger the Watchdog timeout when copying a local file to
an NFS mounted filesystem (UDP mount, GigE speeds).

It was also possible to trigger this bug with multiple simultaneous TCP
streams,  but that took a little longer.

Copying a local file to an NFS/UDP filesystem would trigger the bug in a
few seconds.

If there's anything we can do to help debug this,  please let us know.



* With the following patch applied:
--- /usr/src/sys/dev/bce/if_bce.c.orig  Wed Oct 18 17:19:02 2006
+++ /usr/src/sys/dev/bce/if_bce.c       Wed Oct 18 17:39:11 2006
@@ -4521,6 +4521,7 @@
         bus_dmamap_t map;
         struct tx_bd *txbd = NULL;
         struct mbuf *m0;
+    struct m_tag *mtag;
         u32 vlan_tag_flags = 0;
         u32 prod_bseq;
         u16 chain_prod, prod;
@@ -4540,9 +4541,10 @@
         }

         /* Transfer any VLAN tags to the bd. */
-       if (m0->m_flags & M_VLANTAG)
+    mtag = VLAN_OUTPUT_TAG(sc->bce_ifp, m0);
+    if (mtag != NULL)
                 vlan_tag_flags |= (TX_BD_FLAGS_VLAN_TAG |
-                       (m0->m_pkthdr.ether_vtag << 16));
+                       (VLAN_TAG_VALUE(mtag) << 16));

         /* Map the mbuf into DMAable memory. */
         prod = sc->tx_prod;