D50713.1783698050.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D50713.1783698050.diff
View Options

	diff --git a/sys/net/iflib.c b/sys/net/iflib.c
	--- a/sys/net/iflib.c
	+++ b/sys/net/iflib.c
	@@ -712,7 +712,7 @@
	static void iflib_altq_if_start(if_t ifp);
	static int iflib_altq_if_transmit(if_t ifp, struct mbuf *m);
	#endif
	-static int iflib_register(if_ctx_t);
	+static void iflib_register(if_ctx_t);
	static void iflib_deregister(if_ctx_t);
	static void iflib_unregister_vlan_handlers(if_ctx_t ctx);
	static uint16_t iflib_get_mbuf_size_for(unsigned int size);
	@@ -5136,10 +5136,7 @@
	ctx->ifc_dev = dev;
	ctx->ifc_softc = sc;

	- if ((err = iflib_register(ctx)) != 0) {
	- device_printf(dev, "iflib_register failed %d\n", err);
	- goto fail_ctx_free;
	- }
	+ iflib_register(ctx);
	iflib_add_device_sysctl_pre(ctx);

	scctx = &ctx->ifc_softc_ctx;
	@@ -5387,7 +5384,6 @@
	CTX_UNLOCK(ctx);
	IFNET_WUNLOCK();
	iflib_deregister(ctx);
	-fail_ctx_free:
	device_set_softc(ctx->ifc_dev, NULL);
	if (ctx->ifc_flags & IFC_SC_ALLOCATED)
	free(ctx->ifc_softc, M_IFLIB);
	@@ -5685,7 +5681,7 @@
	MPASS(scctx->isc_txrx->ift_rxd_flush);
	}

	-static int
	+static void
	iflib_register(if_ctx_t ctx)
	{
	if_shared_ctx_t sctx = ctx->ifc_sctx;
	@@ -5731,7 +5727,6 @@
	ifmedia_init(ctx->ifc_mediap, IFM_IMASK,
	iflib_media_change, iflib_media_status);
	}
	- return (0);
	}

	static void