svn commit: r208103 - head/sys/dev/e1000

[Jack F Vogel]

Author: jfv
Date: Fri May 14 22:18:34 2010
New Revision: 208103
URL: http://svn.freebsd.org/changeset/base/208103

Log:
  Small changes preparing for MFC, need to conditionalize
  the buf_ring_free call, and lem is missing the WOL change
  put into em.

Modified:
  head/sys/dev/e1000/if_em.c
  head/sys/dev/e1000/if_igb.c
  head/sys/dev/e1000/if_lem.c

Modified: head/sys/dev/e1000/if_em.c
==============================================================================
--- head/sys/dev/e1000/if_em.c	Fri May 14 22:00:37 2010	(r208102)
+++ head/sys/dev/e1000/if_em.c	Fri May 14 22:18:34 2010	(r208103)
@@ -2948,7 +2948,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: head/sys/dev/e1000/if_igb.c
==============================================================================
--- head/sys/dev/e1000/if_igb.c	Fri May 14 22:00:37 2010	(r208102)
+++ head/sys/dev/e1000/if_igb.c	Fri May 14 22:18:34 2010	(r208103)
@@ -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: head/sys/dev/e1000/if_lem.c
==============================================================================
--- head/sys/dev/e1000/if_lem.c	Fri May 14 22:00:37 2010	(r208102)
+++ head/sys/dev/e1000/if_lem.c	Fri May 14 22:18:34 2010	(r208103)
@@ -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;
 	}
 		
 	/*