View | Details | Raw Unified | Return to bug 218113 | Differences between
and this patch

Collapse All | Expand All

(-)sys/dev/e1000/if_em.c (-2 / +4 lines)
Lines 556-562 Link Here
556
	if (em_allocate_pci_resources(adapter)) {
556
	if (em_allocate_pci_resources(adapter)) {
557
		device_printf(dev, "Allocation of PCI resources failed\n");
557
		device_printf(dev, "Allocation of PCI resources failed\n");
558
		error = ENXIO;
558
		error = ENXIO;
559
		goto err_pci;
559
		goto err_lock;
560
	}
560
	}
561
561
562
	/*
562
	/*
Lines 817-825 Link Here
817
	em_release_hw_control(adapter);
817
	em_release_hw_control(adapter);
818
	if (adapter->ifp != (void *)NULL)
818
	if (adapter->ifp != (void *)NULL)
819
		if_free(adapter->ifp);
819
		if_free(adapter->ifp);
820
	if (adapter->mta != NULL)
821
		free(adapter->mta, M_DEVBUF);
820
err_pci:
822
err_pci:
821
	em_free_pci_resources(adapter);
823
	em_free_pci_resources(adapter);
822
	free(adapter->mta, M_DEVBUF);
824
err_lock:
823
	EM_CORE_LOCK_DESTROY(adapter);
825
	EM_CORE_LOCK_DESTROY(adapter);
824
826
825
	return (error);
827
	return (error);
(-)sys/dev/e1000/if_igb.c (-3 / +4 lines)
Lines 447-453 Link Here
447
	if (igb_allocate_pci_resources(adapter)) {
447
	if (igb_allocate_pci_resources(adapter)) {
448
		device_printf(dev, "Allocation of PCI resources failed\n");
448
		device_printf(dev, "Allocation of PCI resources failed\n");
449
		error = ENXIO;
449
		error = ENXIO;
450
		goto err_pci;
450
		goto err_lock;
451
	}
451
	}
452
452
453
	/* Do Shared Code initialization */
453
	/* Do Shared Code initialization */
Lines 664-674 Link Here
664
	igb_free_transmit_structures(adapter);
664
	igb_free_transmit_structures(adapter);
665
	igb_free_receive_structures(adapter);
665
	igb_free_receive_structures(adapter);
666
	igb_release_hw_control(adapter);
666
	igb_release_hw_control(adapter);
667
	if(adapter->mta != NULL)
668
		free(adapter->mta, M_DEVBUF);
667
err_pci:
669
err_pci:
668
	igb_free_pci_resources(adapter);
670
	igb_free_pci_resources(adapter);
669
	if (adapter->ifp != NULL)
671
	if (adapter->ifp != NULL)
670
		if_free(adapter->ifp);
672
		if_free(adapter->ifp);
671
	free(adapter->mta, M_DEVBUF);
673
err_lock:
672
	IGB_CORE_LOCK_DESTROY(adapter);
674
	IGB_CORE_LOCK_DESTROY(adapter);
673
675
674
	return (error);
676
	return (error);
Lines 5327-5333 Link Here
5327
	if (adapter->vf_ifp) {
5329
	if (adapter->vf_ifp) {
5328
		e1000_rlpml_set_vf(hw,
5330
		e1000_rlpml_set_vf(hw,
5329
		    adapter->max_frame_size + VLAN_TAG_SIZE);
5331
		    adapter->max_frame_size + VLAN_TAG_SIZE);
5330
		return;
5331
	}
5332
	}
5332
5333
5333
	reg = E1000_READ_REG(hw, E1000_CTRL);
5334
	reg = E1000_READ_REG(hw, E1000_CTRL);

Return to bug 218113