From 46168c54535b302a02f7eb25a0f6586c37cc0bf6 Mon Sep 17 00:00:00 2001 From: Jack F Vogel Date: Fri, 14 May 2010 22:18:34 +0000 Subject: [PATCH] Small changes preparing for MFC, need to conditionalize the buf_ring_free call, and lem is missing the WOL change put into em. --- sys/dev/e1000/if_em.c | 2 ++ sys/dev/e1000/if_igb.c | 2 ++ sys/dev/e1000/if_lem.c | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 2fb4f1744647..e245a9523922 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -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); diff --git a/sys/dev/e1000/if_igb.c b/sys/dev/e1000/if_igb.c index e901bc24e2f9..459c18afe5b7 100644 --- a/sys/dev/e1000/if_igb.c +++ b/sys/dev/e1000/if_igb.c @@ -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); diff --git a/sys/dev/e1000/if_lem.c b/sys/dev/e1000/if_lem.c index 825fb4ee6f09..8df52894bdaf 100644 --- a/sys/dev/e1000/if_lem.c +++ b/sys/dev/e1000/if_lem.c @@ -2422,10 +2422,10 @@ lem_setup_interface(device_t dev, struct adapter *adapter) 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; } /*