Deleted Added
full compact
if_em.c (150124) if_em.c (150306)
1/**************************************************************************
2
3Copyright (c) 2001-2005, Intel Corporation
4All rights reserved.
5
6Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met:
8

--- 17 unchanged lines hidden (view full) ---

26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30POSSIBILITY OF SUCH DAMAGE.
31
32***************************************************************************/
33
1/**************************************************************************
2
3Copyright (c) 2001-2005, Intel Corporation
4All rights reserved.
5
6Redistribution and use in source and binary forms, with or without
7modification, are permitted provided that the following conditions are met:
8

--- 17 unchanged lines hidden (view full) ---

26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
30POSSIBILITY OF SUCH DAMAGE.
31
32***************************************************************************/
33
34/*$FreeBSD: head/sys/dev/em/if_em.c 150124 2005-09-14 10:28:01Z ru $*/
34/*$FreeBSD: head/sys/dev/em/if_em.c 150306 2005-09-19 03:10:21Z imp $*/
35
36#include <dev/em/if_em.h>
37
38/*********************************************************************
39 * Set this to one to display debug statistics
40 *********************************************************************/
41int em_display_debug_stats = 0;
42

--- 487 unchanged lines hidden (view full) ---

530 adapter->in_detach = 1;
531 em_stop(adapter);
532 em_phy_hw_reset(&adapter->hw);
533 EM_UNLOCK(adapter);
534#if __FreeBSD_version < 500000
535 ether_ifdetach(adapter->ifp, ETHER_BPF_SUPPORTED);
536#else
537 ether_ifdetach(adapter->ifp);
35
36#include <dev/em/if_em.h>
37
38/*********************************************************************
39 * Set this to one to display debug statistics
40 *********************************************************************/
41int em_display_debug_stats = 0;
42

--- 487 unchanged lines hidden (view full) ---

530 adapter->in_detach = 1;
531 em_stop(adapter);
532 em_phy_hw_reset(&adapter->hw);
533 EM_UNLOCK(adapter);
534#if __FreeBSD_version < 500000
535 ether_ifdetach(adapter->ifp, ETHER_BPF_SUPPORTED);
536#else
537 ether_ifdetach(adapter->ifp);
538 if_free(ifp);
539#endif
540 em_free_pci_resources(adapter);
541 bus_generic_detach(dev);
538#endif
539 em_free_pci_resources(adapter);
540 bus_generic_detach(dev);
541#if __FreeBSD_version >= 500000
542 if_free(ifp);
543#endif
542
543 /* Free Transmit Descriptor ring */
544 if (adapter->tx_desc_base) {
545 em_dma_free(adapter, &adapter->txdma);
546 adapter->tx_desc_base = NULL;
547 }
548
549 /* Free Receive Descriptor ring */

--- 2911 unchanged lines hidden ---
544
545 /* Free Transmit Descriptor ring */
546 if (adapter->tx_desc_base) {
547 em_dma_free(adapter, &adapter->txdma);
548 adapter->tx_desc_base = NULL;
549 }
550
551 /* Free Receive Descriptor ring */

--- 2911 unchanged lines hidden ---