svn commit: r333886 - head/sys/net

[Matt Macy]

Author: mmacy
Date: Sat May 19 19:00:04 2018
New Revision: 333886
URL: https://svnweb.freebsd.org/changeset/base/333886

Log:
  net: fix uninitialized variable warning

Modified:
  head/sys/net/if.c
  head/sys/net/iflib.c

Modified: head/sys/net/if.c
==============================================================================
--- head/sys/net/if.c	Sat May 19 18:50:58 2018	(r333885)
+++ head/sys/net/if.c	Sat May 19 19:00:04 2018	(r333886)
@@ -2967,7 +2967,7 @@ int
 ifioctl(struct socket *so, u_long cmd, caddr_t data, struct thread *td)
 {
 #ifdef COMPAT_FREEBSD32
-	caddr_t saved_data;
+	caddr_t saved_data = NULL;
 	struct ifmediareq ifmr;
 #endif
 	struct ifmediareq *ifmrp;

Modified: head/sys/net/iflib.c
==============================================================================
--- head/sys/net/iflib.c	Sat May 19 18:50:58 2018	(r333885)
+++ head/sys/net/iflib.c	Sat May 19 19:00:04 2018	(r333886)
@@ -2599,8 +2599,7 @@ iflib_rxeof(iflib_rxq_t rxq, qidx_t budget)
 	iflib_fl_t fl;
 	struct ifnet *ifp;
 	int lro_enabled;
-	bool lro_possible = false;
-	bool v4_forwarding, v6_forwarding;
+	bool v4_forwarding, v6_forwarding, lro_possible;
 
 	/*
 	 * XXX early demux data packets so that if_input processing only handles
@@ -2608,6 +2607,7 @@ iflib_rxeof(iflib_rxq_t rxq, qidx_t budget)
 	 */
 	struct mbuf *m, *mh, *mt, *mf;
 
+	lro_possible = v4_forwarding = v6_forwarding = false;
 	ifp = ctx->ifc_ifp;
 	mh = mt = NULL;
 	MPASS(budget > 0);