Author: jfv
Date: Fri May 14 22:20:58 2010
New Revision: 208104
URL: http://svn.freebsd.org/changeset/base/208104
Log:
Missing fix in lem code to limit WOL to MAGIC,
and made code backward compatible to 7.3 with
conditionals around the buf_ring_free call.
Modified:
stable/8/sys/dev/e1000/if_em.c
stable/8/sys/dev/e1000/if_igb.c
stable/8/sys/dev/e1000/if_lem.c
Modified: stable/8/sys/dev/e1000/if_em.c
==============================================================================
--- stable/8/sys/dev/e1000/if_em.c Fri May 14 22:18:34 2010
(r208103)
+++ stable/8/sys/dev/e1000/if_em.c Fri May 14 22:20:58 2010
(r208104)
@@ -2951,7 +2951,9 @@ err_tx_desc:
em_dma_free(adapter, &txr->txdma);
free(adapter->rx_rings, M_DEVBUF);
rx_fail:
+#if __FreeBSD_version >= 800000
buf_ring_free(txr->br, M_DEVBUF);
+#endif
free(adapter->tx_rings, M_DEVBUF);
fail:
return (error);
Modified: stable/8/sys/dev/e1000/if_igb.c
==============================================================================
--- stable/8/sys/dev/e1000/if_igb.c Fri May 14 22:18:34 2010
(r208103)
+++ stable/8/sys/dev/e1000/if_igb.c Fri May 14 22:20:58 2010
(r208104)
@@ -2969,7 +2969,9 @@ err_tx_desc:
igb_dma_free(adapter, &txr->txdma);
free(adapter->rx_rings, M_DEVBUF);
rx_fail:
+#if __FreeBSD_version >= 800000
buf_ring_free(txr->br, M_DEVBUF);
+#endif
free(adapter->tx_rings, M_DEVBUF);
tx_fail:
free(adapter->queues, M_DEVBUF);
Modified: stable/8/sys/dev/e1000/if_lem.c
==============================================================================
--- stable/8/sys/dev/e1000/if_lem.c Fri May 14 22:18:34 2010
(r208103)
+++ stable/8/sys/dev/e1000/if_lem.c Fri May 14 22:20:58 2010
(r208104)
@@ -2422,10 +2422,10 @@ lem_setup_interface(device_t dev, struct
ifp->if_capabilities |= IFCAP_POLLING;
#endif
- /* Enable All WOL methods by default */
+ /* Enable only WOL MAGIC by default */
if (adapter->wol) {
ifp->if_capabilities |= IFCAP_WOL;
- ifp->if_capenable |= IFCAP_WOL;
+ ifp->if_capenable |= IFCAP_WOL_MAGIC;
}
/*
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
