svn commit: r348060 - head/sys/netinet

[Bjoern A. Zeeb]

Author: bz
Date: Tue May 21 19:18:55 2019
New Revision: 348060
URL: https://svnweb.freebsd.org/changeset/base/348060

Log:
  Similarly to r338257,338306 try to fold the two consecutive
  #ifdef RSS section in udp_output() into one by moving a '}'
  outside of the conditional block.
  
  MFC after:	2 months
  Event:		Waterloo Hackathon 2019

Modified:
  head/sys/netinet/udp_usrreq.c

Modified: head/sys/netinet/udp_usrreq.c
==============================================================================
--- head/sys/netinet/udp_usrreq.c	Tue May 21 18:42:36 2019	(r348059)
+++ head/sys/netinet/udp_usrreq.c	Tue May 21 19:18:55 2019	(r348060)
@@ -1505,8 +1505,9 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct s
 	if (flowtype != M_HASHTYPE_NONE) {
 		m->m_pkthdr.flowid = flowid;
 		M_HASHTYPE_SET(m, flowtype);
+	}
 #ifdef	RSS
-	} else {
+	else {
 		uint32_t hash_val, hash_type;
 		/*
 		 * Calculate an appropriate RSS hash for UDP and
@@ -1529,10 +1530,8 @@ udp_output(struct inpcb *inp, struct mbuf *m, struct s
 			m->m_pkthdr.flowid = hash_val;
 			M_HASHTYPE_SET(m, hash_type);
 		}
-#endif
 	}
 
-#ifdef	RSS
 	/*
 	 * Don't override with the inp cached flowid value.
 	 *