D45740.diff
No OneTemporary
Actions

Size

55 KB

Referenced Files

None

Subscribers

None

D45740.diff
View Options

	diff --git a/sys/arm/allwinner/if_emac.c b/sys/arm/allwinner/if_emac.c
	--- a/sys/arm/allwinner/if_emac.c
	+++ b/sys/arm/allwinner/if_emac.c
	@@ -940,11 +940,6 @@
	emac_reset(sc);

	ifp = sc->emac_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "unable to allocate ifp\n");
	- error = ENOSPC;
	- goto fail;
	- }
	if_setsoftc(ifp, sc);

	/* Setup MII */
	diff --git a/sys/arm/ti/cpsw/if_cpsw.c b/sys/arm/ti/cpsw/if_cpsw.c
	--- a/sys/arm/ti/cpsw/if_cpsw.c
	+++ b/sys/arm/ti/cpsw/if_cpsw.c
	@@ -1025,11 +1025,6 @@

	/* Allocate network interface */
	ifp = sc->ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- cpswp_detach(dev);
	- return (ENXIO);
	- }
	-
	if_initname(ifp, device_get_name(sc->dev), sc->unit);
	if_setsoftc(ifp, sc);
	if_setflags(ifp, IFF_SIMPLEX \| IFF_MULTICAST \| IFF_BROADCAST);
	diff --git a/sys/dev/ae/if_ae.c b/sys/dev/ae/if_ae.c
	--- a/sys/dev/ae/if_ae.c
	+++ b/sys/dev/ae/if_ae.c
	@@ -326,12 +326,6 @@
	goto fail;

	ifp = sc->ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "could not allocate ifnet structure.\n");
	- error = ENXIO;
	- goto fail;
	- }
	-
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/age/if_age.c b/sys/dev/age/if_age.c
	--- a/sys/dev/age/if_age.c
	+++ b/sys/dev/age/if_age.c
	@@ -590,12 +590,6 @@
	age_get_macaddr(sc);

	ifp = sc->age_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "cannot allocate ifnet structure.\n");
	- error = ENXIO;
	- goto fail;
	- }
	-
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/alc/if_alc.c b/sys/dev/alc/if_alc.c
	--- a/sys/dev/alc/if_alc.c
	+++ b/sys/dev/alc/if_alc.c
	@@ -1584,12 +1584,6 @@
	alc_get_macaddr(sc);

	ifp = sc->alc_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "cannot allocate ifnet structure.\n");
	- error = ENXIO;
	- goto fail;
	- }
	-
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/ale/if_ale.c b/sys/dev/ale/if_ale.c
	--- a/sys/dev/ale/if_ale.c
	+++ b/sys/dev/ale/if_ale.c
	@@ -609,12 +609,6 @@
	ale_get_macaddr(sc);

	ifp = sc->ale_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "cannot allocate ifnet structure.\n");
	- error = ENXIO;
	- goto fail;
	- }
	-
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/altera/atse/if_atse.c b/sys/dev/altera/atse/if_atse.c
	--- a/sys/dev/altera/atse/if_atse.c
	+++ b/sys/dev/altera/atse/if_atse.c
	@@ -1372,11 +1372,6 @@

	/* Setup interface. */
	ifp = sc->atse_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "if_alloc() failed\n");
	- error = ENOSPC;
	- goto err;
	- }
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/axgbe/if_axgbe.c b/sys/dev/axgbe/if_axgbe.c
	--- a/sys/dev/axgbe/if_axgbe.c
	+++ b/sys/dev/axgbe/if_axgbe.c
	@@ -388,11 +388,6 @@
	OF_getprop(node, "mac-address", sc->mac_addr, ETHER_ADDR_LEN);

	sc->prv.netdev = ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "Cannot alloc ifnet\n");
	- return (ENXIO);
	- }
	-
	sc->prv.dev = dev;
	sc->prv.dmat = bus_get_dma_tag(dev);
	sc->prv.phy.advertising = ADVERTISED_10000baseKR_Full \|
	diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c
	--- a/sys/dev/bce/if_bce.c
	+++ b/sys/dev/bce/if_bce.c
	@@ -1351,12 +1351,6 @@

	/* Allocate an ifnet structure. */
	ifp = sc->bce_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- BCE_PRINTF("%s(%d): Interface allocation failed!\n",
	- __FILE__, __LINE__);
	- rc = ENXIO;
	- goto bce_attach_fail;
	- }

	/* Initialize the ifnet interface. */
	if_setsoftc(ifp, sc);
	diff --git a/sys/dev/bfe/if_bfe.c b/sys/dev/bfe/if_bfe.c
	--- a/sys/dev/bfe/if_bfe.c
	+++ b/sys/dev/bfe/if_bfe.c
	@@ -477,11 +477,6 @@

	/* Set up ifnet structure */
	ifp = sc->bfe_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "failed to if_alloc()\n");
	- error = ENOSPC;
	- goto fail;
	- }
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c
	--- a/sys/dev/bge/if_bge.c
	+++ b/sys/dev/bge/if_bge.c
	@@ -3712,11 +3712,6 @@

	/* Set up ifnet structure */
	ifp = sc->bge_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(sc->bge_dev, "failed to if_alloc()\n");
	- error = ENXIO;
	- goto fail;
	- }
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c
	--- a/sys/dev/bxe/bxe.c
	+++ b/sys/dev/bxe/bxe.c
	@@ -12965,7 +12965,7 @@
	BXE_CORE_UNLOCK(sc);
	}

	-static int
	+static void
	bxe_init_ifnet(struct bxe_softc *sc)
	{
	if_t ifp;
	@@ -12985,10 +12985,7 @@
	BLOGI(sc, "IFMEDIA flags : %x\n", sc->ifmedia.ifm_media);

	/* allocate the ifnet structure */
	- if ((ifp = if_gethandle(IFT_ETHER)) == NULL) {
	- BLOGE(sc, "Interface allocation failed!\n");
	- return (ENXIO);
	- }
	+ ifp = if_gethandle(IFT_ETHER);

	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(sc->dev), device_get_unit(sc->dev));
	@@ -13034,8 +13031,6 @@

	/* Attach driver debugnet methods. */
	DEBUGNET_SET(ifp, bxe);
	-
	- return (0);
	}

	static void
	@@ -16261,12 +16256,7 @@
	bxe_get_phy_info(sc);

	/* initialize the FreeBSD ifnet interface */
	- if (bxe_init_ifnet(sc) != 0) {
	- bxe_release_mutexes(sc);
	- bxe_deallocate_bars(sc);
	- pci_disable_busmaster(dev);
	- return (ENXIO);
	- }
	+ bxe_init_ifnet(sc);

	if (bxe_add_cdev(sc) != 0) {
	if (sc->ifp != NULL) {
	diff --git a/sys/dev/cadence/if_cgem.c b/sys/dev/cadence/if_cgem.c
	--- a/sys/dev/cadence/if_cgem.c
	+++ b/sys/dev/cadence/if_cgem.c
	@@ -1813,11 +1813,6 @@

	/* Set up ifnet structure. */
	ifp = sc->ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "could not allocate ifnet structure\n");
	- cgem_detach(dev);
	- return (ENOMEM);
	- }
	if_setsoftc(ifp, sc);
	if_initname(ifp, IF_CGEM_NAME, device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/cas/if_cas.c b/sys/dev/cas/if_cas.c
	--- a/sys/dev/cas/if_cas.c
	+++ b/sys/dev/cas/if_cas.c
	@@ -188,8 +188,6 @@

	/* Set up ifnet structure. */
	ifp = sc->sc_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL)
	- return (ENOSPC);
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(sc->sc_dev),
	device_get_unit(sc->sc_dev));
	diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c
	--- a/sys/dev/cxgb/cxgb_main.c
	+++ b/sys/dev/cxgb/cxgb_main.c
	@@ -1011,11 +1011,6 @@

	/* Allocate an ifnet object and set it up */
	ifp = p->ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "Cannot allocate ifnet\n");
	- return (ENOMEM);
	- }
	-
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setinitfn(ifp, cxgb_init);
	if_setsoftc(ifp, p);
	diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
	--- a/sys/dev/cxgbe/t4_main.c
	+++ b/sys/dev/cxgbe/t4_main.c
	@@ -2544,7 +2544,7 @@
	IFCAP_HWRXTSTMP \| IFCAP_MEXTPG)
	#define T4_CAP_ENABLE (T4_CAP)

	-static int
	+static void
	cxgbe_vi_attach(device_t dev, struct vi_info *vi)
	{
	if_t ifp;
	@@ -2583,10 +2583,6 @@

	/* Allocate an ifnet and set it up */
	ifp = if_alloc_dev(IFT_ETHER, dev);
	- if (ifp == NULL) {
	- device_printf(dev, "Cannot allocate ifnet\n");
	- return (ENOMEM);
	- }
	vi->ifp = ifp;
	if_setsoftc(ifp, vi);

	@@ -2689,8 +2685,6 @@
	pa.pa_type = PFIL_TYPE_ETHERNET;
	pa.pa_headname = if_name(ifp);
	vi->pfil = pfil_head_register(&pa);
	-
	- return (0);
	}

	static int
	@@ -2699,13 +2693,11 @@
	struct port_info *pi = device_get_softc(dev);
	struct adapter *sc = pi->adapter;
	struct vi_info *vi;
	- int i, rc;
	+ int i;

	sysctl_ctx_init(&pi->ctx);

	- rc = cxgbe_vi_attach(dev, &pi->vi[0]);
	- if (rc)
	- return (rc);
	+ cxgbe_vi_attach(dev, &pi->vi[0]);

	for_each_vi(pi, i, vi) {
	if (i == 0)
	@@ -3584,11 +3576,8 @@
	if (rc)
	return (rc);

	- rc = cxgbe_vi_attach(dev, vi);
	- if (rc) {
	- t4_free_vi(sc, sc->mbox, sc->pf, 0, vi->viid);
	- return (rc);
	- }
	+ cxgbe_vi_attach(dev, vi);
	+
	return (0);
	}

	diff --git a/sys/dev/cxgbe/t4_tracer.c b/sys/dev/cxgbe/t4_tracer.c
	--- a/sys/dev/cxgbe/t4_tracer.c
	+++ b/sys/dev/cxgbe/t4_tracer.c
	@@ -167,11 +167,6 @@
	}

	ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- rc = ENOMEM;
	- goto done;
	- }
	-
	/* Note that if_xname is identical to the nexus nameunit */
	if_initname(ifp, name, -1);
	if_setdname(ifp, t4_cloner_name);
	diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
	--- a/sys/dev/dc/if_dc.c
	+++ b/sys/dev/dc/if_dc.c
	@@ -2380,11 +2380,6 @@
	goto fail;

	ifp = sc->dc_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not if_alloc()\n");
	- error = ENOSPC;
	- goto fail;
	- }
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/dpaa/if_dtsec.c b/sys/dev/dpaa/if_dtsec.c
	--- a/sys/dev/dpaa/if_dtsec.c
	+++ b/sys/dev/dpaa/if_dtsec.c
	@@ -708,12 +708,6 @@

	/* Create network interface for upper layers */
	ifp = sc->sc_ifnet = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(sc->sc_dev, "if_alloc() failed.\n");
	- dtsec_detach(dev);
	- return (ENOMEM);
	- }
	-
	if_setsoftc(ifp, sc);

	if_setflags(ifp, IFF_SIMPLEX \| IFF_BROADCAST \| IFF_MULTICAST);
	diff --git a/sys/dev/dpaa2/dpaa2_ni.c b/sys/dev/dpaa2/dpaa2_ni.c
	--- a/sys/dev/dpaa2/dpaa2_ni.c
	+++ b/sys/dev/dpaa2/dpaa2_ni.c
	@@ -548,11 +548,6 @@

	/* Allocate network interface */
	ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "%s: failed to allocate network interface\n",
	- __func__);
	- goto err_exit;
	- }
	sc->ifp = ifp;
	if_initname(ifp, DPAA2_NI_IFNAME, device_get_unit(sc->dev));

	diff --git a/sys/dev/ena/ena.c b/sys/dev/ena/ena.c
	--- a/sys/dev/ena/ena.c
	+++ b/sys/dev/ena/ena.c
	@@ -148,7 +148,7 @@
	static int ena_get_dev_offloads(struct ena_com_dev_get_features_ctx *);
	static void ena_update_host_info(struct ena_admin_host_info *, if_t);
	static void ena_update_hwassist(struct ena_adapter *);
	-static int ena_setup_ifnet(device_t, struct ena_adapter *,
	+static void ena_setup_ifnet(device_t, struct ena_adapter *,
	struct ena_com_dev_get_features_ctx *);
	static int ena_enable_wc(device_t, struct resource *);
	static int ena_set_queues_placement_policy(device_t, struct ena_com_dev *,
	@@ -2462,7 +2462,7 @@
	if_sethwassistbits(ifp, flags, 0);
	}

	-static int
	+static void
	ena_setup_ifnet(device_t pdev, struct ena_adapter *adapter,
	struct ena_com_dev_get_features_ctx *feat)
	{
	@@ -2470,10 +2470,6 @@
	int caps = 0;

	ifp = adapter->ifp = if_gethandle(IFT_ETHER);
	- if (unlikely(ifp == NULL)) {
	- ena_log(pdev, ERR, "can not allocate ifnet structure\n");
	- return (ENXIO);
	- }
	if_initname(ifp, device_get_name(pdev), device_get_unit(pdev));
	if_setdev(ifp, pdev);
	if_setsoftc(ifp, adapter);
	@@ -2516,8 +2512,6 @@
	ifmedia_set(&adapter->media, IFM_ETHER \| IFM_AUTO);

	ether_ifattach(ifp, adapter->mac_addr);
	-
	- return (0);
	}

	void
	@@ -3811,11 +3805,7 @@
	ena_sysctl_add_nodes(adapter);

	/* setup network interface */
	- rc = ena_setup_ifnet(pdev, adapter, &get_feat_ctx);
	- if (unlikely(rc != 0)) {
	- ena_log(pdev, ERR, "Error with network interface setup\n");
	- goto err_customer_metrics_alloc;
	- }
	+ ena_setup_ifnet(pdev, adapter, &get_feat_ctx);

	/* Initialize reset task queue */
	TASK_INIT(&adapter->reset_task, 0, ena_reset_task, adapter);
	@@ -3852,7 +3842,6 @@
	err_detach:
	ether_ifdetach(adapter->ifp);
	#endif /* DEV_NETMAP */
	-err_customer_metrics_alloc:
	free(adapter->customer_metrics_array, M_DEVBUF);
	err_metrics_buffer_destroy:
	ena_com_delete_customer_metrics_buffer(ena_dev);
	diff --git a/sys/dev/et/if_et.c b/sys/dev/et/if_et.c
	--- a/sys/dev/et/if_et.c
	+++ b/sys/dev/et/if_et.c
	@@ -231,11 +231,6 @@
	callout_init_mtx(&sc->sc_tick, &sc->sc_mtx, 0);

	ifp = sc->ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not if_alloc()\n");
	- error = ENOSPC;
	- goto fail;
	- }

	/*
	* Initialize tunables
	diff --git a/sys/dev/etherswitch/ar40xx/ar40xx_phy.c b/sys/dev/etherswitch/ar40xx/ar40xx_phy.c
	--- a/sys/dev/etherswitch/ar40xx/ar40xx_phy.c
	+++ b/sys/dev/etherswitch/ar40xx/ar40xx_phy.c
	@@ -200,14 +200,6 @@
	snprintf(name, IFNAMSIZ, "%sport", device_get_nameunit(sc->sc_dev));
	for (phy = 0; phy < AR40XX_NUM_PHYS; phy++) {
	sc->sc_phys.ifp[phy] = if_alloc(IFT_ETHER);
	- if (sc->sc_phys.ifp[phy] == NULL) {
	- device_printf(sc->sc_dev,
	- "PHY %d: couldn't allocate ifnet structure\n",
	- phy);
	- err = ENOMEM;
	- break;
	- }
	-
	sc->sc_phys.ifp[phy]->if_softc = sc;
	sc->sc_phys.ifp[phy]->if_flags \|= IFF_UP \| IFF_BROADCAST \|
	IFF_DRV_RUNNING \| IFF_SIMPLEX;
	diff --git a/sys/dev/etherswitch/arswitch/arswitch.c b/sys/dev/etherswitch/arswitch/arswitch.c
	--- a/sys/dev/etherswitch/arswitch/arswitch.c
	+++ b/sys/dev/etherswitch/arswitch/arswitch.c
	@@ -150,12 +150,6 @@
	snprintf(name, IFNAMSIZ, "%sport", device_get_nameunit(sc->sc_dev));
	for (phy = 0; phy < sc->numphys; phy++) {
	sc->ifp[phy] = if_alloc(IFT_ETHER);
	- if (sc->ifp[phy] == NULL) {
	- device_printf(sc->sc_dev, "couldn't allocate ifnet structure\n");
	- err = ENOMEM;
	- break;
	- }
	-
	if_setsoftc(sc->ifp[phy], sc);
	if_setflagbits(sc->ifp[phy], IFF_UP \| IFF_BROADCAST \|
	IFF_DRV_RUNNING \| IFF_SIMPLEX, 0);
	diff --git a/sys/dev/etherswitch/e6000sw/e6000sw.c b/sys/dev/etherswitch/e6000sw/e6000sw.c
	--- a/sys/dev/etherswitch/e6000sw/e6000sw.c
	+++ b/sys/dev/etherswitch/e6000sw/e6000sw.c
	@@ -454,8 +454,6 @@
	snprintf(name, IFNAMSIZ, "%sport", device_get_nameunit(sc->dev));

	sc->ifp[port] = if_alloc(IFT_ETHER);
	- if (sc->ifp[port] == NULL)
	- return (ENOMEM);
	if_setsoftc(sc->ifp[port], sc);
	if_setflagbits(sc->ifp[port], IFF_UP \| IFF_BROADCAST \|
	IFF_DRV_RUNNING \| IFF_SIMPLEX, 0);
	diff --git a/sys/dev/etherswitch/e6000sw/e6060sw.c b/sys/dev/etherswitch/e6000sw/e6060sw.c
	--- a/sys/dev/etherswitch/e6000sw/e6060sw.c
	+++ b/sys/dev/etherswitch/e6000sw/e6060sw.c
	@@ -214,12 +214,6 @@
	sc->ifpport[phy] = port;
	sc->portphy[port] = phy;
	sc->ifp[port] = if_alloc(IFT_ETHER);
	- if (sc->ifp[port] == NULL) {
	- device_printf(sc->sc_dev, "couldn't allocate ifnet structure\n");
	- err = ENOMEM;
	- break;
	- }
	-
	sc->ifp[port]->if_softc = sc;
	sc->ifp[port]->if_flags \|= IFF_UP \| IFF_BROADCAST \|
	IFF_DRV_RUNNING \| IFF_SIMPLEX;
	diff --git a/sys/dev/etherswitch/felix/felix.c b/sys/dev/etherswitch/felix/felix.c
	--- a/sys/dev/etherswitch/felix/felix.c
	+++ b/sys/dev/etherswitch/felix/felix.c
	@@ -240,9 +240,6 @@
	snprintf(name, IFNAMSIZ, "%sport", device_get_nameunit(sc->dev));

	sc->ports[port].ifp = if_alloc(IFT_ETHER);
	- if (sc->ports[port].ifp == NULL)
	- return (ENOMEM);
	-
	if_setsoftc(sc->ports[port].ifp, sc);
	if_setflags(sc->ports[port].ifp, IFF_UP \| IFF_BROADCAST \| IFF_MULTICAST \|
	IFF_DRV_RUNNING \| IFF_SIMPLEX);
	diff --git a/sys/dev/etherswitch/infineon/adm6996fc.c b/sys/dev/etherswitch/infineon/adm6996fc.c
	--- a/sys/dev/etherswitch/infineon/adm6996fc.c
	+++ b/sys/dev/etherswitch/infineon/adm6996fc.c
	@@ -173,12 +173,6 @@
	sc->ifpport[phy] = port;
	sc->portphy[port] = phy;
	sc->ifp[port] = if_alloc(IFT_ETHER);
	- if (sc->ifp[port] == NULL) {
	- device_printf(sc->sc_dev, "couldn't allocate ifnet structure\n");
	- err = ENOMEM;
	- break;
	- }
	-
	sc->ifp[port]->if_softc = sc;
	sc->ifp[port]->if_flags \|= IFF_UP \| IFF_BROADCAST \|
	IFF_DRV_RUNNING \| IFF_SIMPLEX;
	diff --git a/sys/dev/etherswitch/ip17x/ip17x.c b/sys/dev/etherswitch/ip17x/ip17x.c
	--- a/sys/dev/etherswitch/ip17x/ip17x.c
	+++ b/sys/dev/etherswitch/ip17x/ip17x.c
	@@ -172,12 +172,6 @@
	sc->phyport[phy] = port;
	sc->portphy[port] = phy;
	sc->ifp[port] = if_alloc(IFT_ETHER);
	- if (sc->ifp[port] == NULL) {
	- device_printf(sc->sc_dev, "couldn't allocate ifnet structure\n");
	- err = ENOMEM;
	- break;
	- }
	-
	if_setsoftc(sc->ifp[port], sc);
	if_setflags(sc->ifp[port], IFF_UP \| IFF_BROADCAST \|
	IFF_DRV_RUNNING \| IFF_SIMPLEX);
	diff --git a/sys/dev/etherswitch/micrel/ksz8995ma.c b/sys/dev/etherswitch/micrel/ksz8995ma.c
	--- a/sys/dev/etherswitch/micrel/ksz8995ma.c
	+++ b/sys/dev/etherswitch/micrel/ksz8995ma.c
	@@ -219,12 +219,6 @@
	sc->ifpport[phy] = port;
	sc->portphy[port] = phy;
	sc->ifp[port] = if_alloc(IFT_ETHER);
	- if (sc->ifp[port] == NULL) {
	- device_printf(sc->sc_dev, "couldn't allocate ifnet structure\n");
	- err = ENOMEM;
	- break;
	- }
	-
	sc->ifp[port]->if_softc = sc;
	sc->ifp[port]->if_flags \|= IFF_UP \| IFF_BROADCAST \|
	IFF_DRV_RUNNING \| IFF_SIMPLEX;
	diff --git a/sys/dev/etherswitch/mtkswitch/mtkswitch.c b/sys/dev/etherswitch/mtkswitch/mtkswitch.c
	--- a/sys/dev/etherswitch/mtkswitch/mtkswitch.c
	+++ b/sys/dev/etherswitch/mtkswitch/mtkswitch.c
	@@ -121,12 +121,6 @@
	continue;
	}
	sc->ifp[phy] = if_alloc(IFT_ETHER);
	- if (sc->ifp[phy] == NULL) {
	- device_printf(sc->sc_dev, "couldn't allocate ifnet structure\n");
	- err = ENOMEM;
	- break;
	- }
	-
	sc->ifp[phy]->if_softc = sc;
	sc->ifp[phy]->if_flags \|= IFF_UP \| IFF_BROADCAST \|
	IFF_DRV_RUNNING \| IFF_SIMPLEX;
	diff --git a/sys/dev/etherswitch/rtl8366/rtl8366rb.c b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
	--- a/sys/dev/etherswitch/rtl8366/rtl8366rb.c
	+++ b/sys/dev/etherswitch/rtl8366/rtl8366rb.c
	@@ -238,12 +238,6 @@
	/* PHYs need an interface, so we generate a dummy one */
	for (i = 0; i < sc->numphys; i++) {
	sc->ifp[i] = if_alloc(IFT_ETHER);
	- if (sc->ifp[i] == NULL) {
	- device_printf(dev, "couldn't allocate ifnet structure\n");
	- err = ENOMEM;
	- break;
	- }
	-
	if_setsoftc(sc->ifp[i], sc);
	if_setflagbits(sc->ifp[i], IFF_UP \| IFF_BROADCAST \| IFF_DRV_RUNNING
	\| IFF_SIMPLEX, 0);
	diff --git a/sys/dev/etherswitch/ukswitch/ukswitch.c b/sys/dev/etherswitch/ukswitch/ukswitch.c
	--- a/sys/dev/etherswitch/ukswitch/ukswitch.c
	+++ b/sys/dev/etherswitch/ukswitch/ukswitch.c
	@@ -124,12 +124,6 @@
	sc->ifpport[phy] = port;
	sc->portphy[port] = phy;
	sc->ifp[port] = if_alloc(IFT_ETHER);
	- if (sc->ifp[port] == NULL) {
	- device_printf(sc->sc_dev, "couldn't allocate ifnet structure\n");
	- err = ENOMEM;
	- break;
	- }
	-
	if_setsoftc(sc->ifp[port], sc);
	if_setflags(sc->ifp[port], IFF_UP \| IFF_BROADCAST \|
	IFF_DRV_RUNNING \| IFF_SIMPLEX);
	diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
	--- a/sys/dev/firewire/if_fwe.c
	+++ b/sys/dev/firewire/if_fwe.c
	@@ -178,10 +178,6 @@

	/* fill the rest and attach interface */
	ifp = fwe->eth_softc.ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not if_alloc()\n");
	- return (ENOSPC);
	- }
	if_setsoftc(ifp, &fwe->eth_softc);

	if_initname(ifp, device_get_name(dev), unit);
	@@ -201,7 +197,7 @@
	if_setcapenablebit(ifp, IFCAP_VLAN_MTU, 0);

	FWEDEBUG(ifp, "interface created\n");
	- return 0;
	+ return (0);
	}

	static void
	diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
	--- a/sys/dev/firewire/if_fwip.c
	+++ b/sys/dev/firewire/if_fwip.c
	@@ -153,8 +153,6 @@
	fwip = ((struct fwip_softc *)device_get_softc(dev));
	unit = device_get_unit(dev);
	ifp = fwip->fw_softc.fwip_ifp = if_alloc(IFT_IEEE1394);
	- if (ifp == NULL)
	- return (ENOSPC);

	mtx_init(&fwip->mtx, "fwip", NULL, MTX_DEF);
	/* XXX */
	@@ -199,7 +197,7 @@
	splx(s);

	FWIPDEBUG(ifp, "interface created\n");
	- return 0;
	+ return (0);
	}

	static void
	diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
	--- a/sys/dev/fxp/if_fxp.c
	+++ b/sys/dev/fxp/if_fxp.c
	@@ -443,11 +443,6 @@
	fxp_serial_ifmedia_sts);

	ifp = sc->ifp = if_gethandle(IFT_ETHER);
	- if (ifp == (void *)NULL) {
	- device_printf(dev, "can not if_alloc()\n");
	- error = ENOSPC;
	- goto fail;
	- }

	/*
	* Enable bus mastering.
	diff --git a/sys/dev/gem/if_gem.c b/sys/dev/gem/if_gem.c
	--- a/sys/dev/gem/if_gem.c
	+++ b/sys/dev/gem/if_gem.c
	@@ -152,8 +152,6 @@

	/* Set up ifnet structure. */
	ifp = sc->sc_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL)
	- return (ENOSPC);
	sc->sc_csum_features = GEM_CSUM_FEATURES;
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(sc->sc_dev),
	diff --git a/sys/dev/gve/gve_main.c b/sys/dev/gve/gve_main.c
	--- a/sys/dev/gve/gve_main.c
	+++ b/sys/dev/gve/gve_main.c
	@@ -352,18 +352,13 @@
	}
	}

	-static int
	+static void
	gve_setup_ifnet(device_t dev, struct gve_priv *priv)
	{
	int caps = 0;
	if_t ifp;

	ifp = priv->ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(priv->dev, "Failed to allocate ifnet struct\n");
	- return (ENXIO);
	- }
	-
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setsoftc(ifp, priv);
	if_setdev(ifp, dev);
	@@ -401,8 +396,6 @@

	ifmedia_add(&priv->media, IFM_ETHER \| IFM_AUTO, 0, NULL);
	ifmedia_set(&priv->media, IFM_ETHER \| IFM_AUTO);
	-
	- return (0);
	}

	static int
	@@ -794,9 +787,7 @@
	if (err != 0)
	goto abort;

	- err = gve_setup_ifnet(dev, priv);
	- if (err != 0)
	- goto abort;
	+ gve_setup_ifnet(dev, priv);

	priv->rx_copybreak = GVE_DEFAULT_RX_COPYBREAK;

	diff --git a/sys/dev/iicbus/if_ic.c b/sys/dev/iicbus/if_ic.c
	--- a/sys/dev/iicbus/if_ic.c
	+++ b/sys/dev/iicbus/if_ic.c
	@@ -162,8 +162,6 @@
	if_t ifp;

	ifp = sc->ic_ifp = if_alloc(IFT_PARA);
	- if (ifp == NULL)
	- return (ENOSPC);

	mtx_init(&sc->ic_lock, device_get_nameunit(dev), MTX_NETWORK_LOCK,
	MTX_DEF);
	diff --git a/sys/dev/jme/if_jme.c b/sys/dev/jme/if_jme.c
	--- a/sys/dev/jme/if_jme.c
	+++ b/sys/dev/jme/if_jme.c
	@@ -804,12 +804,6 @@
	goto fail;

	ifp = sc->jme_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "cannot allocate ifnet structure.\n");
	- error = ENXIO;
	- goto fail;
	- }
	-
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/le/lance.c b/sys/dev/le/lance.c
	--- a/sys/dev/le/lance.c
	+++ b/sys/dev/le/lance.c
	@@ -107,8 +107,6 @@
	return (ENXIO);

	ifp = sc->sc_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL)
	- return (ENOSPC);

	callout_init_mtx(&sc->sc_wdog_ch, &sc->sc_mtx, 0);

	diff --git a/sys/dev/lge/if_lge.c b/sys/dev/lge/if_lge.c
	--- a/sys/dev/lge/if_lge.c
	+++ b/sys/dev/lge/if_lge.c
	@@ -512,11 +512,6 @@
	}

	ifp = sc->lge_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not if_alloc()\n");
	- error = ENOSPC;
	- goto fail;
	- }
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/liquidio/lio_main.c b/sys/dev/liquidio/lio_main.c
	--- a/sys/dev/liquidio/lio_main.c
	+++ b/sys/dev/liquidio/lio_main.c
	@@ -1327,11 +1327,6 @@

	ifp = if_alloc(IFT_ETHER);

	- if (ifp == NULL) {
	- lio_dev_err(octeon_dev, "Device allocation failed\n");
	- goto setup_nic_dev_fail;
	- }
	-
	lio = malloc(sizeof(struct lio), M_DEVBUF, M_NOWAIT \| M_ZERO);

	if (lio == NULL) {
	diff --git a/sys/dev/mana/mana_en.c b/sys/dev/mana/mana_en.c
	--- a/sys/dev/mana/mana_en.c
	+++ b/sys/dev/mana/mana_en.c
	@@ -2805,11 +2805,6 @@
	int err;

	ndev = if_alloc_dev(IFT_ETHER, gc->dev);
	- if (!ndev) {
	- mana_err(NULL, "Failed to allocate ifnet struct\n");
	- return ENOMEM;
	- }
	-
	*ndev_storage = ndev;

	apc = malloc(sizeof(*apc), M_DEVBUF, M_WAITOK \| M_ZERO);
	diff --git a/sys/dev/mge/if_mge.c b/sys/dev/mge/if_mge.c
	--- a/sys/dev/mge/if_mge.c
	+++ b/sys/dev/mge/if_mge.c
	@@ -847,12 +847,6 @@

	/* Allocate network interface */
	ifp = sc->ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "if_alloc() failed\n");
	- mge_detach(dev);
	- return (ENOMEM);
	- }
	-
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setsoftc(ifp, sc);
	if_setflags(ifp, IFF_SIMPLEX \| IFF_MULTICAST \| IFF_BROADCAST);
	diff --git a/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c b/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c
	--- a/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c
	+++ b/sys/dev/mlx4/mlx4_en/mlx4_en_netdev.c
	@@ -2143,11 +2143,6 @@

	priv = kzalloc(sizeof(*priv), GFP_KERNEL);
	dev = priv->dev = if_alloc(IFT_ETHER);
	- if (dev == NULL) {
	- en_err(priv, "Net device allocation failed\n");
	- kfree(priv);
	- return -ENOMEM;
	- }
	if_setsoftc(dev, priv);
	if_initname(dev, "mlxen", (device_get_unit(
	mdev->pdev->dev.bsddev) * MLX4_MAX_PORTS) + port - 1);
	diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
	--- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
	+++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
	@@ -4486,10 +4486,6 @@
	M_MLX5EN, mlx5_dev_domainset(mdev), M_WAITOK \| M_ZERO);

	ifp = priv->ifp = if_alloc_dev(IFT_ETHER, mdev->pdev->dev.bsddev);
	- if (ifp == NULL) {
	- mlx5_core_err(mdev, "if_alloc() failed\n");
	- goto err_free_priv;
	- }
	/* setup all static fields */
	if (mlx5e_priv_static_init(priv, mdev, mdev->priv.eq_table.num_comp_vectors)) {
	mlx5_core_err(mdev, "mlx5e_priv_static_init() failed\n");
	@@ -4829,8 +4825,6 @@

	err_free_ifp:
	if_free(ifp);
	-
	-err_free_priv:
	free(priv, M_MLX5EN);
	return (NULL);
	}
	diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c
	--- a/sys/dev/msk/if_msk.c
	+++ b/sys/dev/msk/if_msk.c
	@@ -1623,11 +1623,6 @@
	msk_rx_dma_jalloc(sc_if);

	ifp = sc_if->msk_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(sc_if->msk_if_dev, "can not if_alloc()\n");
	- error = ENOSPC;
	- goto fail;
	- }
	if_setsoftc(ifp, sc_if);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/mxge/if_mxge.c b/sys/dev/mxge/if_mxge.c
	--- a/sys/dev/mxge/if_mxge.c
	+++ b/sys/dev/mxge/if_mxge.c
	@@ -4640,11 +4640,6 @@
	}

	ifp = sc->ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not if_alloc()\n");
	- err = ENOSPC;
	- goto abort_with_parent_dmat;
	- }
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));

	snprintf(sc->cmd_mtx_name, sizeof(sc->cmd_mtx_name), "%s:cmd",
	@@ -4813,7 +4808,6 @@
	mtx_destroy(&sc->cmd_mtx);
	mtx_destroy(&sc->driver_mtx);
	if_free(ifp);
	-abort_with_parent_dmat:
	bus_dma_tag_destroy(sc->parent_dmat);
	abort_with_tq:
	if (sc->tq != NULL) {
	diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c
	--- a/sys/dev/my/if_my.c
	+++ b/sys/dev/my/if_my.c
	@@ -873,11 +873,6 @@
	bzero(sc->my_ldata, sizeof(struct my_list_data));

	ifp = sc->my_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not if_alloc()\n");
	- error = ENOSPC;
	- goto free_ldata;
	- }
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	@@ -961,7 +956,6 @@
	ether_ifdetach(ifp);
	free_if:
	if_free(ifp);
	-free_ldata:
	free(sc->my_ldata_ptr, M_DEVBUF);
	release_irq:
	bus_release_resource(dev, SYS_RES_IRQ, 0, sc->my_irq);
	diff --git a/sys/dev/neta/if_mvneta.c b/sys/dev/neta/if_mvneta.c
	--- a/sys/dev/neta/if_mvneta.c
	+++ b/sys/dev/neta/if_mvneta.c
	@@ -612,11 +612,6 @@

	/* Allocate network interface */
	ifp = sc->ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(self, "if_alloc() failed\n");
	- mvneta_detach(self);
	- return (ENOMEM);
	- }
	if_initname(ifp, device_get_name(self), device_get_unit(self));

	/*
	diff --git a/sys/dev/netmap/if_ptnet.c b/sys/dev/netmap/if_ptnet.c
	--- a/sys/dev/netmap/if_ptnet.c
	+++ b/sys/dev/netmap/if_ptnet.c
	@@ -399,12 +399,6 @@

	/* Setup Ethernet interface. */
	sc->ifp = ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "Failed to allocate ifnet\n");
	- err = ENOMEM;
	- goto err_path;
	- }
	-
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setbaudrate(ifp, IF_Gbps(10));
	if_setsoftc(ifp, sc);
	diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c
	--- a/sys/dev/netmap/netmap_freebsd.c
	+++ b/sys/dev/netmap/netmap_freebsd.c
	@@ -612,10 +612,6 @@
	eaddr[5] = (uint8_t)unit;

	ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- nm_prerr("if_alloc failed");
	- return ENOMEM;
	- }
	if_initname(ifp, name, IF_DUNIT_NONE);
	if_setflags(ifp, IFF_UP \| IFF_SIMPLEX \| IFF_MULTICAST);
	if_setinitfn(ifp, (void *)nm_vi_dummy);
	diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c
	--- a/sys/dev/nfe/if_nfe.c
	+++ b/sys/dev/nfe/if_nfe.c
	@@ -567,11 +567,6 @@
	goto fail;

	ifp = sc->nfe_ifp = if_gethandle(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not if_gethandle()\n");
	- error = ENOSPC;
	- goto fail;
	- }

	/*
	* Allocate Tx and Rx rings.
	diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
	--- a/sys/dev/nge/if_nge.c
	+++ b/sys/dev/nge/if_nge.c
	@@ -900,11 +900,6 @@
	nge_sysctl_node(sc);

	ifp = sc->nge_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not allocate ifnet structure\n");
	- error = ENOSPC;
	- goto fail;
	- }
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/ntb/if_ntb/if_ntb.c b/sys/dev/ntb/if_ntb/if_ntb.c
	--- a/sys/dev/ntb/if_ntb/if_ntb.c
	+++ b/sys/dev/ntb/if_ntb/if_ntb.c
	@@ -136,10 +136,6 @@
	int i;

	ifp = sc->ifp = if_gethandle(IFT_ETHER);
	- if (ifp == NULL) {
	- printf("ntb: Cannot allocate ifnet structure\n");
	- return (ENOMEM);
	- }
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setdev(ifp, dev);

	diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c
	--- a/sys/dev/oce/oce_if.c
	+++ b/sys/dev/oce/oce_if.c
	@@ -170,7 +170,7 @@
	static void oce_rx_mbuf_chain(struct oce_rq rq, struct oce_common_cqe_info cqe_info, struct mbuf **m);

	/* Helper function prototypes in this file */
	-static int oce_attach_ifp(POCE_SOFTC sc);
	+static void oce_attach_ifp(POCE_SOFTC sc);
	static void oce_add_vlan(void *arg, if_t ifp, uint16_t vtag);
	static void oce_del_vlan(void *arg, if_t ifp, uint16_t vtag);
	static int oce_vid_config(POCE_SOFTC sc);
	@@ -334,9 +334,7 @@
	if (rc)
	goto intr_free;

	- rc = oce_attach_ifp(sc);
	- if (rc)
	- goto queues_free;
	+ oce_attach_ifp(sc);

	#if defined(INET6) \|\| defined(INET)
	rc = oce_init_lro(sc);
	@@ -392,7 +390,6 @@
	#endif
	ether_ifdetach(sc->ifp);
	if_free(sc->ifp);
	-queues_free:
	oce_queue_release_all(sc);
	intr_free:
	oce_intr_free(sc);
	@@ -2099,13 +2096,11 @@
	* Helper function prototypes in this file *
	*****************************************************************************/

	-static int
	+static void
	oce_attach_ifp(POCE_SOFTC sc)
	{

	sc->ifp = if_alloc(IFT_ETHER);
	- if (!sc->ifp)
	- return ENOMEM;

	ifmedia_init(&sc->media, IFM_IMASK, oce_media_change, oce_media_status);
	ifmedia_add(&sc->media, IFM_ETHER \| IFM_AUTO, 0, NULL);
	@@ -2148,8 +2143,6 @@
	if_sethwtsomaxsegsize(sc->ifp, 4096);

	ether_ifattach(sc->ifp, sc->macaddr.mac_addr);
	-
	- return 0;
	}

	static void
	diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c
	--- a/sys/dev/ppbus/if_plip.c
	+++ b/sys/dev/ppbus/if_plip.c
	@@ -249,10 +249,6 @@
	}

	ifp = lp->sc_ifp = if_alloc(IFT_PARA);
	- if (ifp == NULL) {
	- return (ENOSPC);
	- }
	-
	if_setsoftc(ifp, lp);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setmtu(ifp, LPMTU);
	diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c
	--- a/sys/dev/qlnx/qlnxe/qlnx_os.c
	+++ b/sys/dev/qlnx/qlnxe/qlnx_os.c
	@@ -2292,10 +2292,6 @@
	if_t ifp;

	ifp = ha->ifp = if_alloc(IFT_ETHER);
	-
	- if (ifp == NULL)
	- panic("%s: cannot if_alloc()\n", device_get_nameunit(dev));
	-
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));

	device_id = pci_get_device(ha->pci_dev);
	diff --git a/sys/dev/qlxgb/qla_os.c b/sys/dev/qlxgb/qla_os.c
	--- a/sys/dev/qlxgb/qla_os.c
	+++ b/sys/dev/qlxgb/qla_os.c
	@@ -658,9 +658,6 @@

	ifp = ha->ifp = if_alloc(IFT_ETHER);

	- if (ifp == NULL)
	- panic("%s: cannot if_alloc()\n", device_get_nameunit(dev));
	-
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));

	if_setmtu(ifp, ETHERMTU);
	diff --git a/sys/dev/qlxgbe/ql_os.c b/sys/dev/qlxgbe/ql_os.c
	--- a/sys/dev/qlxgbe/ql_os.c
	+++ b/sys/dev/qlxgbe/ql_os.c
	@@ -852,10 +852,6 @@
	QL_DPRINT2(ha, (dev, "%s: enter\n", __func__));

	ifp = ha->ifp = if_alloc(IFT_ETHER);
	-
	- if (ifp == NULL)
	- panic("%s: cannot if_alloc()\n", device_get_nameunit(dev));
	-
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));

	if_setbaudrate(ifp, IF_Gbps(10));
	diff --git a/sys/dev/qlxge/qls_os.c b/sys/dev/qlxge/qls_os.c
	--- a/sys/dev/qlxge/qls_os.c
	+++ b/sys/dev/qlxge/qls_os.c
	@@ -719,10 +719,6 @@
	QL_DPRINT2((dev, "%s: enter\n", __func__));

	ifp = ha->ifp = if_alloc(IFT_ETHER);
	-
	- if (ifp == NULL)
	- panic("%s: cannot if_alloc()\n", device_get_nameunit(dev));
	-
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setbaudrate(ifp, IF_Gbps(10));
	if_setinitfn(ifp, qls_init);
	diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
	--- a/sys/dev/re/if_re.c
	+++ b/sys/dev/re/if_re.c
	@@ -1606,11 +1606,6 @@
	re_add_sysctls(sc);

	ifp = sc->rl_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not if_alloc()\n");
	- error = ENOSPC;
	- goto fail;
	- }

	/* Take controller out of deep sleep mode. */
	if ((sc->rl_flags & RL_FLAG_MACSLEEP) != 0) {
	diff --git a/sys/dev/rl/if_rl.c b/sys/dev/rl/if_rl.c
	--- a/sys/dev/rl/if_rl.c
	+++ b/sys/dev/rl/if_rl.c
	@@ -780,11 +780,6 @@
	goto fail;

	ifp = sc->rl_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not if_alloc()\n");
	- error = ENOSPC;
	- goto fail;
	- }

	#define RL_PHYAD_INTERNAL 0

	diff --git a/sys/dev/sbni/if_sbni.c b/sys/dev/sbni/if_sbni.c
	--- a/sys/dev/sbni/if_sbni.c
	+++ b/sys/dev/sbni/if_sbni.c
	@@ -212,7 +212,7 @@
	/*
	* Install interface into kernel networking data structures
	*/
	-int
	+void
	sbni_attach(struct sbni_softc *sc, int unit, struct sbni_flags flags)
	{
	if_t ifp;
	@@ -220,8 +220,6 @@
	uint64_t baudrate;

	ifp = sc->ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL)
	- return (ENOMEM);
	sbni_outb(sc, CSR0, 0);
	set_initial_values(sc, flags);

	@@ -250,7 +248,6 @@
	printf("auto\n");
	else
	printf("%d (fixed)\n", sc->cur_rxl_index);
	- return (0);
	}

	void
	diff --git a/sys/dev/sbni/if_sbni_isa.c b/sys/dev/sbni/if_sbni_isa.c
	--- a/sys/dev/sbni/if_sbni_isa.c
	+++ b/sys/dev/sbni/if_sbni_isa.c
	@@ -136,12 +136,7 @@

	(u_int32_t)&flags = device_get_flags(dev);

	- error = sbni_attach(sc, device_get_unit(dev) * 2, flags);
	- if (error) {
	- device_printf(dev, "cannot initialize driver\n");
	- sbni_release_resources(sc);
	- return (error);
	- }
	+ sbni_attach(sc, device_get_unit(dev) * 2, flags);

	if (sc->irq_res) {
	error = bus_setup_intr(
	diff --git a/sys/dev/sbni/if_sbni_pci.c b/sys/dev/sbni/if_sbni_pci.c
	--- a/sys/dev/sbni/if_sbni_pci.c
	+++ b/sys/dev/sbni/if_sbni_pci.c
	@@ -131,20 +131,9 @@

	memset(&flags, 0, sizeof(flags));

	- error = sbni_attach(sc, device_get_unit(dev) * 2, flags);
	- if (error) {
	- device_printf(dev, "cannot initialize driver\n");
	- goto attach_failed;
	- }
	- if (sc->slave_sc) {
	- error = sbni_attach(sc->slave_sc, device_get_unit(dev) * 2 + 1,
	- flags);
	- if (error) {
	- device_printf(dev, "cannot initialize slave\n");
	- sbni_detach(sc);
	- goto attach_failed;
	- }
	- }
	+ sbni_attach(sc, device_get_unit(dev) * 2, flags);
	+ if (sc->slave_sc)
	+ sbni_attach(sc->slave_sc, device_get_unit(dev) * 2 + 1, flags);

	if (sc->irq_res) {
	error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET \|
	diff --git a/sys/dev/sbni/if_sbnivar.h b/sys/dev/sbni/if_sbnivar.h
	--- a/sys/dev/sbni/if_sbnivar.h
	+++ b/sys/dev/sbni/if_sbnivar.h
	@@ -125,7 +125,7 @@

	void sbni_intr(void *);
	int sbni_probe(struct sbni_softc *);
	-int sbni_attach(struct sbni_softc *, int, struct sbni_flags);
	+void sbni_attach(struct sbni_softc *, int, struct sbni_flags);
	void sbni_detach(struct sbni_softc *);
	void sbni_release_resources(struct sbni_softc *);

	diff --git a/sys/dev/sfxge/sfxge.c b/sys/dev/sfxge/sfxge.c
	--- a/sys/dev/sfxge/sfxge.c
	+++ b/sys/dev/sfxge/sfxge.c
	@@ -1081,11 +1081,6 @@

	/* Allocate ifnet. */
	ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "Couldn't allocate ifnet\n");
	- error = ENOMEM;
	- goto fail;
	- }
	sc->ifnet = ifp;

	/* Initialize hardware. */
	@@ -1122,8 +1117,6 @@

	fail2:
	if_free(sc->ifnet);
	-
	-fail:
	DBGPRINT(sc->dev, "failed %d", error);
	return (error);
	}
	diff --git a/sys/dev/sge/if_sge.c b/sys/dev/sge/if_sge.c
	--- a/sys/dev/sge/if_sge.c
	+++ b/sys/dev/sge/if_sge.c
	@@ -603,11 +603,6 @@
	goto fail;

	ifp = sc->sge_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "cannot allocate ifnet structure.\n");
	- error = ENOSPC;
	- goto fail;
	- }
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/sis/if_sis.c b/sys/dev/sis/if_sis.c
	--- a/sys/dev/sis/if_sis.c
	+++ b/sys/dev/sis/if_sis.c
	@@ -1057,11 +1057,6 @@
	goto fail;

	ifp = sc->sis_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not if_alloc()\n");
	- error = ENOSPC;
	- goto fail;
	- }
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
	--- a/sys/dev/sk/if_sk.c
	+++ b/sys/dev/sk/if_sk.c
	@@ -1279,11 +1279,6 @@
	sk_dma_jumbo_alloc(sc_if);

	ifp = sc_if->sk_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(sc_if->sk_if_dev, "can not if_alloc()\n");
	- error = ENOSPC;
	- goto fail;
	- }
	if_setsoftc(ifp, sc_if);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/smc/if_smc.c b/sys/dev/smc/if_smc.c
	--- a/sys/dev/smc/if_smc.c
	+++ b/sys/dev/smc/if_smc.c
	@@ -313,10 +313,6 @@
	sc->smc_dev = dev;

	ifp = sc->smc_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- error = ENOSPC;
	- goto done;
	- }

	mtx_init(&sc->smc_mtx, device_get_nameunit(dev), NULL, MTX_DEF);

	diff --git a/sys/dev/ste/if_ste.c b/sys/dev/ste/if_ste.c
	--- a/sys/dev/ste/if_ste.c
	+++ b/sys/dev/ste/if_ste.c
	@@ -987,11 +987,6 @@
	goto fail;

	ifp = sc->ste_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not if_alloc()\n");
	- error = ENOSPC;
	- goto fail;
	- }

	/* Do MII setup. */
	phy = MII_PHY_ANY;
	diff --git a/sys/dev/stge/if_stge.c b/sys/dev/stge/if_stge.c
	--- a/sys/dev/stge/if_stge.c
	+++ b/sys/dev/stge/if_stge.c
	@@ -560,12 +560,6 @@
	}

	ifp = sc->sc_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(sc->sc_dev, "failed to if_alloc()\n");
	- error = ENXIO;
	- goto fail;
	- }
	-
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/sume/if_sume.c b/sys/dev/sume/if_sume.c
	--- a/sys/dev/sume/if_sume.c
	+++ b/sys/dev/sume/if_sume.c
	@@ -1143,7 +1143,7 @@
	}
	}

	-static int
	+static void
	sume_ifp_alloc(struct sume_adapter *adapter, uint32_t port)
	{
	if_t ifp;
	@@ -1151,11 +1151,6 @@
	M_ZERO \| M_WAITOK);

	ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(adapter->dev, "cannot allocate ifnet\n");
	- return (ENOMEM);
	- }
	-
	adapter->ifp[port] = ifp;
	if_setsoftc(ifp, nf_priv);

	@@ -1181,8 +1176,6 @@
	ifmedia_set(&nf_priv->media, IFM_ETHER \| IFM_10G_SR);

	if_setdrvflagbits(ifp, IFF_DRV_RUNNING, 0);
	-
	- return (0);
	}

	static void
	@@ -1452,11 +1445,8 @@
	goto error;

	/* Now do the network interfaces. */
	- for (i = 0; i < SUME_NPORTS; i++) {
	- error = sume_ifp_alloc(adapter, i);
	- if (error != 0)
	- goto error;
	- }
	+ for (i = 0; i < SUME_NPORTS; i++)
	+ sume_ifp_alloc(adapter, i);

	/* Register stats and register sysctls. */
	sume_sysctl_init(adapter);
	diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
	--- a/sys/dev/ti/if_ti.c
	+++ b/sys/dev/ti/if_ti.c
	@@ -2384,11 +2384,6 @@
	callout_init_mtx(&sc->ti_watchdog, &sc->ti_mtx, 0);
	ifmedia_init(&sc->ifmedia, IFM_IMASK, ti_ifmedia_upd, ti_ifmedia_sts);
	ifp = sc->ti_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not if_alloc()\n");
	- error = ENOSPC;
	- goto fail;
	- }
	if_sethwassist(ifp, TI_CSUM_FEATURES);
	if_setcapabilities(ifp, IFCAP_TXCSUM \| IFCAP_RXCSUM);
	if_setcapenable(ifp, if_getcapabilities(sc->ti_ifp));
	diff --git a/sys/dev/tsec/if_tsec.c b/sys/dev/tsec/if_tsec.c
	--- a/sys/dev/tsec/if_tsec.c
	+++ b/sys/dev/tsec/if_tsec.c
	@@ -239,12 +239,6 @@

	/* Create network interface for upper layers */
	ifp = sc->tsec_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(sc->dev, "if_alloc() failed\n");
	- tsec_detach(sc);
	- return (ENOMEM);
	- }
	-
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(sc->dev), device_get_unit(sc->dev));
	if_setflags(ifp, IFF_SIMPLEX \| IFF_MULTICAST \| IFF_BROADCAST);
	diff --git a/sys/dev/usb/net/if_usie.c b/sys/dev/usb/net/if_usie.c
	--- a/sys/dev/usb/net/if_usie.c
	+++ b/sys/dev/usb/net/if_usie.c
	@@ -430,11 +430,6 @@

	/* setup ifnet (Direct IP) */
	sc->sc_ifp = ifp = if_alloc(IFT_OTHER);
	-
	- if (ifp == NULL) {
	- device_printf(self, "Could not allocate a network interface\n");
	- goto detach;
	- }
	if_initname(ifp, "usie", device_get_unit(self));

	if_setsoftc(ifp, sc);
	diff --git a/sys/dev/usb/net/uhso.c b/sys/dev/usb/net/uhso.c
	--- a/sys/dev/usb/net/uhso.c
	+++ b/sys/dev/usb/net/uhso.c
	@@ -1566,10 +1566,6 @@
	}

	sc->sc_ifp = ifp = if_alloc(IFT_OTHER);
	- if (sc->sc_ifp == NULL) {
	- device_printf(sc->sc_dev, "if_alloc() failed\n");
	- return (-1);
	- }

	callout_init_mtx(&sc->sc_c, &sc->sc_mtx, 0);
	mtx_lock(&sc->sc_mtx);
	diff --git a/sys/dev/usb/net/usb_ethernet.c b/sys/dev/usb/net/usb_ethernet.c
	--- a/sys/dev/usb/net/usb_ethernet.c
	+++ b/sys/dev/usb/net/usb_ethernet.c
	@@ -220,11 +220,6 @@
	error = 0;
	CURVNET_SET_QUIET(vnet0);
	ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(ue->ue_dev, "could not allocate ifnet\n");
	- goto fail;
	- }
	-
	if_setsoftc(ifp, ue);
	if_initname(ifp, "ue", ue->ue_unit);
	if (ue->ue_methods->ue_attach_post_sub != NULL) {
	diff --git a/sys/dev/usb/usb_pf.c b/sys/dev/usb/usb_pf.c
	--- a/sys/dev/usb/usb_pf.c
	+++ b/sys/dev/usb/usb_pf.c
	@@ -195,12 +195,6 @@
	return (error);
	}
	ifp = ubus->ifp = if_alloc(IFT_USB);
	- if (ifp == NULL) {
	- ifc_free_unit(ifc, unit);
	- device_printf(ubus->parent, "usbpf: Could not allocate "
	- "instance\n");
	- return (ENOSPC);
	- }
	if_setsoftc(ifp, ubus);
	if_initname(ifp, usbusname, unit);
	if_setname(ifp, name);
	diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
	--- a/sys/dev/vge/if_vge.c
	+++ b/sys/dev/vge/if_vge.c
	@@ -1093,12 +1093,6 @@
	goto fail;

	ifp = sc->vge_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not if_alloc()\n");
	- error = ENOSPC;
	- goto fail;
	- }
	-
	vge_miipoll_start(sc);
	/* Do MII setup */
	error = mii_attach(dev, &sc->vge_miibus, ifp, vge_ifmedia_upd,
	diff --git a/sys/dev/virtio/network/if_vtnet.c b/sys/dev/virtio/network/if_vtnet.c
	--- a/sys/dev/virtio/network/if_vtnet.c
	+++ b/sys/dev/virtio/network/if_vtnet.c
	@@ -115,7 +115,7 @@
	static int vtnet_alloc_rx_filters(struct vtnet_softc *);
	static void vtnet_free_rx_filters(struct vtnet_softc *);
	static int vtnet_alloc_virtqueues(struct vtnet_softc *);
	-static int vtnet_alloc_interface(struct vtnet_softc *);
	+static void vtnet_alloc_interface(struct vtnet_softc *);
	static int vtnet_setup_interface(struct vtnet_softc *);
	static int vtnet_ioctl_mtu(struct vtnet_softc *, u_int);
	static int vtnet_ioctl_ifflags(struct vtnet_softc *);
	@@ -437,12 +437,7 @@
	callout_init_mtx(&sc->vtnet_tick_ch, VTNET_CORE_MTX(sc), 0);
	vtnet_load_tunables(sc);

	- error = vtnet_alloc_interface(sc);
	- if (error) {
	- device_printf(dev, "cannot allocate interface\n");
	- goto fail;
	- }
	-
	+ vtnet_alloc_interface(sc);
	vtnet_setup_sysctl(sc);

	error = vtnet_setup_features(sc);
	@@ -1069,7 +1064,7 @@
	return (error);
	}

	-static int
	+static void
	vtnet_alloc_interface(struct vtnet_softc *sc)
	{
	device_t dev;
	@@ -1078,14 +1073,9 @@
	dev = sc->vtnet_dev;

	ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL)
	- return (ENOMEM);
	-
	sc->vtnet_ifp = ifp;
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	-
	- return (0);
	}

	static int
	diff --git a/sys/dev/vnic/nicvf_main.c b/sys/dev/vnic/nicvf_main.c
	--- a/sys/dev/vnic/nicvf_main.c
	+++ b/sys/dev/vnic/nicvf_main.c
	@@ -139,7 +139,7 @@
	static int nicvf_rss_init(struct nicvf *);
	static int nicvf_init_resources(struct nicvf *);

	-static int nicvf_setup_ifnet(struct nicvf *);
	+static void nicvf_setup_ifnet(struct nicvf *);
	static int nicvf_setup_ifmedia(struct nicvf *);
	static void nicvf_hw_addr_random(uint8_t *);

	@@ -247,11 +247,7 @@
	nicvf_rss_init(nic);
	NICVF_CORE_UNLOCK(nic);

	- err = nicvf_setup_ifnet(nic);
	- if (err != 0) {
	- device_printf(dev, "Could not set-up ifnet\n");
	- goto err_release_intr;
	- }
	+ nicvf_setup_ifnet(nic);

	err = nicvf_setup_ifmedia(nic);
	if (err != 0) {
	@@ -329,17 +325,12 @@
	memcpy(hwaddr, addr, ETHER_ADDR_LEN);
	}

	-static int
	+static void
	nicvf_setup_ifnet(struct nicvf *nic)
	{
	if_t ifp;

	ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(nic->dev, "Could not allocate ifnet structure\n");
	- return (ENOMEM);
	- }
	-
	nic->ifp = ifp;

	if_setsoftc(ifp, nic);
	@@ -379,8 +370,6 @@
	if (nic->hw_tso)
	if_sethwassistbits(ifp, (CSUM_TSO), 0);
	if_setcapenable(ifp, if_getcapabilities(ifp));
	-
	- return (0);
	}

	static int
	diff --git a/sys/dev/vnic/thunder_mdio.c b/sys/dev/vnic/thunder_mdio.c
	--- a/sys/dev/vnic/thunder_mdio.c
	+++ b/sys/dev/vnic/thunder_mdio.c
	@@ -453,10 +453,6 @@
	if (pd == NULL)
	return (ENOMEM);
	pd->ifp = if_alloc(IFT_ETHER);
	- if (pd->ifp == NULL) {
	- free(pd, M_THUNDER_MDIO);
	- return (ENOMEM);
	- }
	pd->lmacid = lmacid;
	}

	diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
	--- a/sys/dev/vr/if_vr.c
	+++ b/sys/dev/vr/if_vr.c
	@@ -656,11 +656,6 @@

	/* Allocate ifnet structure. */
	ifp = sc->vr_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "couldn't allocate ifnet structure\n");
	- error = ENOSPC;
	- goto fail;
	- }
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/vte/if_vte.c b/sys/dev/vte/if_vte.c
	--- a/sys/dev/vte/if_vte.c
	+++ b/sys/dev/vte/if_vte.c
	@@ -435,12 +435,6 @@
	vte_get_macaddr(sc);

	ifp = sc->vte_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "cannot allocate ifnet structure.\n");
	- error = ENXIO;
	- goto fail;
	- }
	-
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/xilinx/if_xae.c b/sys/dev/xilinx/if_xae.c
	--- a/sys/dev/xilinx/if_xae.c
	+++ b/sys/dev/xilinx/if_xae.c
	@@ -990,11 +990,6 @@

	/* Set up the ethernet interface. */
	sc->ifp = ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "could not allocate ifp.\n");
	- return (ENXIO);
	- }
	-
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
	if_setflags(ifp, IFF_BROADCAST \| IFF_SIMPLEX \| IFF_MULTICAST);
	diff --git a/sys/dev/xl/if_xl.c b/sys/dev/xl/if_xl.c
	--- a/sys/dev/xl/if_xl.c
	+++ b/sys/dev/xl/if_xl.c
	@@ -1188,11 +1188,6 @@

	/* Initialize interface name. */
	ifp = sc->xl_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not if_alloc()\n");
	- error = ENOSPC;
	- goto fail;
	- }
	if_setsoftc(ifp, sc);
	if_initname(ifp, device_get_name(dev), device_get_unit(dev));

	diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
	--- a/sys/net/if_bridge.c
	+++ b/sys/net/if_bridge.c
	@@ -754,10 +754,6 @@

	sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK\|M_ZERO);
	ifp = sc->sc_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- free(sc, M_DEVBUF);
	- return (ENOSPC);
	- }

	BRIDGE_LOCK_INIT(sc);
	sc->sc_brtmax = BRIDGE_RTABLE_MAX;
	diff --git a/sys/net/if_disc.c b/sys/net/if_disc.c
	--- a/sys/net/if_disc.c
	+++ b/sys/net/if_disc.c
	@@ -85,11 +85,6 @@

	sc = malloc(sizeof(struct disc_softc), M_DISC, M_WAITOK \| M_ZERO);
	ifp = sc->sc_ifp = if_alloc(IFT_LOOP);
	- if (ifp == NULL) {
	- free(sc, M_DISC);
	- return (ENOSPC);
	- }
	-
	ifp->if_softc = sc;
	if_initname(ifp, discname, unit);
	ifp->if_mtu = DSMTU;
	diff --git a/sys/net/if_edsc.c b/sys/net/if_edsc.c
	--- a/sys/net/if_edsc.c
	+++ b/sys/net/if_edsc.c
	@@ -102,11 +102,6 @@
	*/
	sc = malloc(sizeof(struct edsc_softc), M_EDSC, M_WAITOK \| M_ZERO);
	ifp = sc->sc_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- free(sc, M_EDSC);
	- return (ENOSPC);
	- }
	-
	ifp->if_softc = sc;

	/*
	diff --git a/sys/net/if_enc.c b/sys/net/if_enc.c
	--- a/sys/net/if_enc.c
	+++ b/sys/net/if_enc.c
	@@ -163,10 +163,6 @@
	sc = malloc(sizeof(struct enc_softc), M_DEVBUF,
	M_WAITOK \| M_ZERO);
	ifp = sc->sc_ifp = if_alloc(IFT_ENC);
	- if (ifp == NULL) {
	- free(sc, M_DEVBUF);
	- return (ENOSPC);
	- }
	if (V_enc_sc != NULL) {
	if_free(ifp);
	free(sc, M_DEVBUF);
	diff --git a/sys/net/if_epair.c b/sys/net/if_epair.c
	--- a/sys/net/if_epair.c
	+++ b/sys/net/if_epair.c
	@@ -516,9 +516,6 @@
	struct epair_softc *sc;

	struct ifnet *ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL)
	- return (NULL);
	-
	sc = malloc(sizeof(struct epair_softc), M_EPAIR, M_WAITOK \| M_ZERO);
	sc->ifp = ifp;
	sc->num_queues = epair_tasks.tasks;
	@@ -614,8 +611,6 @@
	static void
	epair_free_sc(struct epair_softc *sc)
	{
	- if (sc == NULL)
	- return;

	if_free(sc->ifp);
	ifmedia_removeall(&sc->media);
	@@ -714,12 +709,6 @@
	/* Allocate memory for both [ab] interfaces */
	sca = epair_alloc_sc(ifc);
	scb = epair_alloc_sc(ifc);
	- if (sca == NULL \|\| scb == NULL) {
	- epair_free_sc(sca);
	- epair_free_sc(scb);
	- ifc_free_unit(ifc, unit);
	- return (ENOSPC);
	- }

	/*
	* Cross-reference the interfaces so we will be able to free both.
	diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c
	--- a/sys/net/if_lagg.c
	+++ b/sys/net/if_lagg.c
	@@ -536,10 +536,6 @@

	sc = malloc(sizeof(*sc), M_LAGG, M_WAITOK \| M_ZERO);
	ifp = sc->sc_ifp = if_alloc(if_type);
	- if (ifp == NULL) {
	- free(sc, M_LAGG);
	- return (ENOSPC);
	- }
	LAGG_SX_INIT(sc);

	mtx_init(&sc->sc_mtx, "lagg-mtx", NULL, MTX_DEF);
	diff --git a/sys/net/if_loop.c b/sys/net/if_loop.c
	--- a/sys/net/if_loop.c
	+++ b/sys/net/if_loop.c
	@@ -123,9 +123,6 @@
	struct ifnet *ifp;

	ifp = if_alloc(IFT_LOOP);
	- if (ifp == NULL)
	- return (ENOSPC);
	-
	if_initname(ifp, loname, ifd->unit);
	ifp->if_mtu = LOMTU;
	ifp->if_flags = IFF_LOOPBACK \| IFF_MULTICAST;
	diff --git a/sys/net/if_stf.c b/sys/net/if_stf.c
	--- a/sys/net/if_stf.c
	+++ b/sys/net/if_stf.c
	@@ -264,11 +264,6 @@

	sc = malloc(sizeof(struct stf_softc), M_STF, M_WAITOK \| M_ZERO);
	ifp = STF2IFP(sc) = if_alloc(IFT_STF);
	- if (ifp == NULL) {
	- free(sc, M_STF);
	- ifc_free_unit(ifc, unit);
	- return (ENOSPC);
	- }
	ifp->if_softc = sc;
	sc->sc_fibnum = curthread->td_proc->p_fibnum;

	diff --git a/sys/net/if_tuntap.c b/sys/net/if_tuntap.c
	--- a/sys/net/if_tuntap.c
	+++ b/sys/net/if_tuntap.c
	@@ -939,9 +939,6 @@
	iflags \|= IFF_POINTOPOINT;
	}
	ifp = tp->tun_ifp = if_alloc(type);
	- if (ifp == NULL)
	- panic("%s%d: failed to if_alloc() interface.\n",
	- drv->cdevsw.d_name, dev2unit(dev));
	ifp->if_softc = tp;
	if_initname(ifp, drv->cdevsw.d_name, dev2unit(dev));
	ifp->if_ioctl = tunifioctl;
	diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
	--- a/sys/net/if_vlan.c
	+++ b/sys/net/if_vlan.c
	@@ -1163,14 +1163,6 @@

	ifv = malloc(sizeof(struct ifvlan), M_VLAN, M_WAITOK \| M_ZERO);
	ifp = ifv->ifv_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- if (!subinterface)
	- ifc_free_unit(ifc, unit);
	- free(ifv, M_VLAN);
	- if (p != NULL)
	- if_rele(p);
	- return (ENOSPC);
	- }
	CK_SLIST_INIT(&ifv->vlan_mc_listhead);
	ifp->if_softc = ifv;
	/*
	diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c
	--- a/sys/net/if_vxlan.c
	+++ b/sys/net/if_vxlan.c
	@@ -3248,11 +3248,6 @@
	}

	ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- error = ENOSPC;
	- goto fail;
	- }
	-
	sc->vxl_ifp = ifp;
	rm_init(&sc->vxl_lock, "vxlanrm");
	callout_init_rw(&sc->vxl_callout, &sc->vxl_lock, 0);
	diff --git a/sys/net/iflib.c b/sys/net/iflib.c
	--- a/sys/net/iflib.c
	+++ b/sys/net/iflib.c
	@@ -5751,10 +5751,6 @@
	CTX_LOCK_INIT(ctx);
	STATE_LOCK_INIT(ctx, device_get_nameunit(ctx->ifc_dev));
	ifp = ctx->ifc_ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- device_printf(dev, "can not allocate ifnet structure\n");
	- return (ENOMEM);
	- }

	/*
	* Initialize our context's device specific methods
	diff --git a/sys/net80211/ieee80211.c b/sys/net80211/ieee80211.c
	--- a/sys/net80211/ieee80211.c
	+++ b/sys/net80211/ieee80211.c
	@@ -562,10 +562,6 @@
	struct ifnet *ifp;

	ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- ic_printf(ic, "%s: unable to allocate ifnet\n", __func__);
	- return ENOMEM;
	- }
	if_initname(ifp, name, unit);
	ifp->if_softc = vap; /* back pointer */
	ifp->if_flags = IFF_SIMPLEX \| IFF_BROADCAST \| IFF_MULTICAST;
	diff --git a/sys/netgraph/ng_eiface.c b/sys/netgraph/ng_eiface.c
	--- a/sys/netgraph/ng_eiface.c
	+++ b/sys/netgraph/ng_eiface.c
	@@ -388,12 +388,7 @@

	/* Allocate node and interface private structures */
	priv = malloc(sizeof(*priv), M_NETGRAPH, M_WAITOK \| M_ZERO);
	-
	ifp = priv->ifp = if_alloc(IFT_ETHER);
	- if (ifp == NULL) {
	- free(priv, M_NETGRAPH);
	- return (ENOSPC);
	- }

	/* Link them together */
	ifp->if_softc = priv;
	diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c
	--- a/sys/netgraph/ng_iface.c
	+++ b/sys/netgraph/ng_iface.c
	@@ -524,10 +524,6 @@
	/* Allocate node and interface private structures */
	priv = malloc(sizeof(*priv), M_NETGRAPH_IFACE, M_WAITOK \| M_ZERO);
	ifp = if_alloc(IFT_PROPVIRTUAL);
	- if (ifp == NULL) {
	- free(priv, M_NETGRAPH_IFACE);
	- return (ENOMEM);
	- }

	rm_init(&priv->lock, "ng_iface private rmlock");

	diff --git a/sys/netpfil/ipfw/ip_fw_bpf.c b/sys/netpfil/ipfw/ip_fw_bpf.c
	--- a/sys/netpfil/ipfw/ip_fw_bpf.c
	+++ b/sys/netpfil/ipfw/ip_fw_bpf.c
	@@ -95,8 +95,6 @@
	struct ifnet *ifp;

	ifp = if_alloc(IFT_PFLOG);
	- if (ifp == NULL)
	- return (ENOSPC);
	if_initname(ifp, ipfwname, unit);
	ifp->if_flags = IFF_UP \| IFF_SIMPLEX \| IFF_MULTICAST;
	ifp->if_mtu = 65536;
	@@ -121,8 +119,6 @@
	struct ifnet *ifp;

	ifp = if_alloc(IFT_PFLOG);
	- if (ifp == NULL)
	- return (ENOSPC);
	if_initname(ifp, ipfwlogname, unit);
	ifp->if_flags = IFF_UP \| IFF_SIMPLEX \| IFF_MULTICAST;
	ifp->if_mtu = 65536;
	diff --git a/sys/netpfil/pf/if_pflog.c b/sys/netpfil/pf/if_pflog.c
	--- a/sys/netpfil/pf/if_pflog.c
	+++ b/sys/netpfil/pf/if_pflog.c
	@@ -129,9 +129,6 @@
	return (EINVAL);

	ifp = if_alloc(IFT_PFLOG);
	- if (ifp == NULL) {
	- return (ENOSPC);
	- }
	if_initname(ifp, pflogname, ifd->unit);
	ifp->if_mtu = PFLOGMTU;
	ifp->if_ioctl = pflogioctl;
	diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c
	--- a/sys/netpfil/pf/if_pfsync.c
	+++ b/sys/netpfil/pf/if_pfsync.c
	@@ -396,10 +396,6 @@
	sc->sc_version = PFSYNC_MSG_VERSION_DEFAULT;

	ifp = sc->sc_ifp = if_alloc(IFT_PFSYNC);
	- if (ifp == NULL) {
	- free(sc, M_PFSYNC);
	- return (ENOSPC);
	- }
	if_initname(ifp, pfsyncname, unit);
	ifp->if_softc = sc;
	ifp->if_ioctl = pfsyncioctl;
	diff --git a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
	--- a/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
	+++ b/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c
	@@ -906,10 +906,6 @@

	priv = ipoib_priv_alloc();
	dev = priv->dev = if_alloc(IFT_INFINIBAND);
	- if (!dev) {
	- free(priv, M_TEMP);
	- return NULL;
	- }
	if_setsoftc(dev, priv);
	priv->gone = 2; /* initializing */
	priv->unit = alloc_unr(ipoib_unrhdr);

File Metadata

Mime Type: text/plain
Expires: Fri, Nov 8, 10:13 PM (10 h, 13 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 14544084
Default Alt Text: D45740.diff (55 KB)

D45740.diffNo OneTemporaryActions

D45740.diffView Options

File Metadata

Event Timeline

D45740.diff
No OneTemporary
Actions

D45740.diff
View Options