diff options
| author | jfv <jfv@FreeBSD.org> | 2010-05-14 22:18:34 +0000 |
|---|---|---|
| committer | jfv <jfv@FreeBSD.org> | 2010-05-14 22:18:34 +0000 |
| commit | 85e899cc9ab353bf77ab4847690e5cdb554d746c (patch) | |
| tree | 7c786d58e671be53d3256ee7b8ad4df81bf5f368 | |
| parent | dd5138420b34387fce751298f9b8e0db3ba7896b (diff) | |
| download | FreeBSD-src-85e899cc9ab353bf77ab4847690e5cdb554d746c.zip FreeBSD-src-85e899cc9ab353bf77ab4847690e5cdb554d746c.tar.gz | |
Small changes preparing for MFC, need to conditionalize
the buf_ring_free call, and lem is missing the WOL change
put into em.
| -rw-r--r-- | sys/dev/e1000/if_em.c | 2 | ||||
| -rw-r--r-- | sys/dev/e1000/if_igb.c | 2 | ||||
| -rw-r--r-- | 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 2fb4f17..e245a95 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 e901bc2..459c18a 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 825fb4e..8df5289 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; } /* |
