svn commit: r332409 - in head/sys/dev: bnxt e1000 ixgbe

[Mark Johnston]

Author: markj
Date: Wed Apr 11 15:15:34 2018
New Revision: 332409
URL: https://svnweb.freebsd.org/changeset/base/332409

Log:
  Use C99 initializers for iflib function tables.
  
  Reviewed by:	sbruno
  MFC after:	1 week
  Differential Revision:	https://reviews.freebsd.org/D15041

Modified:
  head/sys/dev/bnxt/bnxt_txrx.c
  head/sys/dev/e1000/em_txrx.c
  head/sys/dev/e1000/igb_txrx.c
  head/sys/dev/ixgbe/ix_txrx.c

Modified: head/sys/dev/bnxt/bnxt_txrx.c
==============================================================================
--- head/sys/dev/bnxt/bnxt_txrx.c	Wed Apr 11 15:04:31 2018	(r332408)
+++ head/sys/dev/bnxt/bnxt_txrx.c	Wed Apr 11 15:15:34 2018	(r332409)
@@ -66,14 +66,14 @@ static int bnxt_isc_rxd_pkt_get(void *sc, if_rxd_info_
 static int bnxt_intr(void *sc);
 
 struct if_txrx bnxt_txrx  = {
-	bnxt_isc_txd_encap,
-	bnxt_isc_txd_flush,
-	bnxt_isc_txd_credits_update,
-	bnxt_isc_rxd_available,
-	bnxt_isc_rxd_pkt_get,
-	bnxt_isc_rxd_refill,
-	bnxt_isc_rxd_flush,
-	bnxt_intr
+	.ift_txd_encap = bnxt_isc_txd_encap,
+	.ift_txd_flush = bnxt_isc_txd_flush,
+	.ift_txd_credits_update = bnxt_isc_txd_credits_update,
+	.ift_rxd_available = bnxt_isc_rxd_available,
+	.ift_rxd_pkt_get = bnxt_isc_rxd_pkt_get,
+	.ift_rxd_refill = bnxt_isc_rxd_refill,
+	.ift_rxd_flush = bnxt_isc_rxd_flush,
+	.ift_legacy_intr = bnxt_intr
 };
 
 /*

Modified: head/sys/dev/e1000/em_txrx.c
==============================================================================
--- head/sys/dev/e1000/em_txrx.c	Wed Apr 11 15:04:31 2018	(r332408)
+++ head/sys/dev/e1000/em_txrx.c	Wed Apr 11 15:15:34 2018	(r332409)
@@ -68,25 +68,25 @@ static int em_determine_rsstype(u32 pkt_info);
 extern int em_intr(void *arg);
 
 struct if_txrx em_txrx = {
-	em_isc_txd_encap,
-	em_isc_txd_flush,
-	em_isc_txd_credits_update,
-	em_isc_rxd_available,
-	em_isc_rxd_pkt_get,
-	em_isc_rxd_refill,
-	em_isc_rxd_flush,
-	em_intr
+	.ift_txd_encap = em_isc_txd_encap,
+	.ift_txd_flush = em_isc_txd_flush,
+	.ift_txd_credits_update = em_isc_txd_credits_update,
+	.ift_rxd_available = em_isc_rxd_available,
+	.ift_rxd_pkt_get = em_isc_rxd_pkt_get,
+	.ift_rxd_refill = em_isc_rxd_refill,
+	.ift_rxd_flush = em_isc_rxd_flush,
+	.ift_legacy_intr = em_intr
 };
 
 struct if_txrx lem_txrx = {
-	em_isc_txd_encap,
-	em_isc_txd_flush,
-	em_isc_txd_credits_update,
-	lem_isc_rxd_available,
-	lem_isc_rxd_pkt_get,
-	lem_isc_rxd_refill,
-	em_isc_rxd_flush,
-	em_intr
+	.ift_txd_encap = em_isc_txd_encap,
+	.ift_txd_flush = em_isc_txd_flush,
+	.ift_txd_credits_update = em_isc_txd_credits_update,
+	.ift_rxd_available = lem_isc_rxd_available,
+	.ift_rxd_pkt_get = lem_isc_rxd_pkt_get,
+	.ift_rxd_refill = lem_isc_rxd_refill,
+	.ift_rxd_flush = em_isc_rxd_flush,
+	.ift_legacy_intr = em_intr
 };
 
 extern if_shared_ctx_t em_sctx;

Modified: head/sys/dev/e1000/igb_txrx.c
==============================================================================
--- head/sys/dev/e1000/igb_txrx.c	Wed Apr 11 15:04:31 2018	(r332408)
+++ head/sys/dev/e1000/igb_txrx.c	Wed Apr 11 15:15:34 2018	(r332409)
@@ -62,14 +62,14 @@ extern void igb_if_enable_intr(if_ctx_t ctx);
 extern int em_intr(void *arg);
 
 struct if_txrx igb_txrx = {
-	igb_isc_txd_encap,
-	igb_isc_txd_flush,
-	igb_isc_txd_credits_update,
-	igb_isc_rxd_available,
-	igb_isc_rxd_pkt_get,
-	igb_isc_rxd_refill,
-	igb_isc_rxd_flush,
-	em_intr
+	.ift_txd_encap = igb_isc_txd_encap,
+	.ift_txd_flush = igb_isc_txd_flush,
+	.ift_txd_credits_update = igb_isc_txd_credits_update,
+	.ift_rxd_available = igb_isc_rxd_available,
+	.ift_rxd_pkt_get = igb_isc_rxd_pkt_get,
+	.ift_rxd_refill = igb_isc_rxd_refill,
+	.ift_rxd_flush = igb_isc_rxd_flush,
+	.ift_legacy_intr = em_intr
 };
 
 extern if_shared_ctx_t em_sctx;

Modified: head/sys/dev/ixgbe/ix_txrx.c
==============================================================================
--- head/sys/dev/ixgbe/ix_txrx.c	Wed Apr 11 15:04:31 2018	(r332408)
+++ head/sys/dev/ixgbe/ix_txrx.c	Wed Apr 11 15:15:34 2018	(r332409)
@@ -62,14 +62,14 @@ extern void ixgbe_if_enable_intr(if_ctx_t ctx);
 static int ixgbe_determine_rsstype(u16 pkt_info);
 
 struct if_txrx ixgbe_txrx  = {
-	ixgbe_isc_txd_encap,
-	ixgbe_isc_txd_flush,
-	ixgbe_isc_txd_credits_update,
-	ixgbe_isc_rxd_available,
-	ixgbe_isc_rxd_pkt_get,
-	ixgbe_isc_rxd_refill,
-	ixgbe_isc_rxd_flush,
-	NULL
+	.ift_txd_encap = ixgbe_isc_txd_encap,
+	.ift_txd_flush = ixgbe_isc_txd_flush,
+	.ift_txd_credits_update = ixgbe_isc_txd_credits_update,
+	.ift_rxd_available = ixgbe_isc_rxd_available,
+	.ift_rxd_pkt_get = ixgbe_isc_rxd_pkt_get,
+	.ift_rxd_refill = ixgbe_isc_rxd_refill,
+	.ift_rxd_flush = ixgbe_isc_rxd_flush,
+	.ift_legacy_intr = NULL
 };
 
 extern if_shared_ctx_t ixgbe_sctx;