svn commit: r341378 - in stable: 10/sys/contrib/ipfilter/netinet 11/sys/contrib/ipfilter/netinet 12/sys/contrib/ipfilter/netinet

[Cy Schubert]

Author: cy
Date: Sat Dec  1 18:09:17 2018
New Revision: 341378
URL: https://svnweb.freebsd.org/changeset/base/341378

Log:
  MFC r340909:
  
  Combine two lines into one following unifdef for r255332.

Modified:
  stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
  stable/12/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
Directory Properties:
  stable/10/   (props changed)
  stable/12/   (props changed)

Modified: stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
==============================================================================
--- stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	Sat Dec  1 17:59:41 2018	(r341377)
+++ stable/11/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c	Sat Dec  1 18:09:17 2018	(r341378)
@@ -299,8 +299,7 @@ ipfdetach(softc)
  * Filter ioctl interface.
  */
 int
-ipfioctl(dev, cmd, data, mode
-, p)
+ipfioctl(dev, cmd, data, mode, p)
 	struct thread *p;
 #    define	p_cred	td_ucred
 #    define	p_uid	td_ucred->cr_ruid