svn commit: r367471 - stable/12/sys/net

Konstantin Belousov kib at FreeBSD.org
Sun Nov 8 01:00:11 UTC 2020


Author: kib
Date: Sun Nov  8 01:00:10 2020
New Revision: 367471
URL: https://svnweb.freebsd.org/changeset/base/367471

Log:
  MFC r367250:
  Cleanup of net/if_media.c: some style.

Modified:
  stable/12/sys/net/if_media.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/net/if_media.c
==============================================================================
--- stable/12/sys/net/if_media.c	Sun Nov  8 00:59:09 2020	(r367470)
+++ stable/12/sys/net/if_media.c	Sun Nov  8 01:00:10 2020	(r367471)
@@ -213,7 +213,7 @@ ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr, st
 	int error = 0;
 
 	if (ifp == NULL || ifr == NULL || ifm == NULL)
-		return(EINVAL);
+		return (EINVAL);
 
 	switch (cmd) {
 
@@ -244,10 +244,9 @@ ifmedia_ioctl(struct ifnet *ifp, struct ifreq *ifr, st
 		 *     Keep going in case the connected media changed.
 		 *     Similarly, if best match changed (kernel debugger?).
 		 */
-		if ((IFM_SUBTYPE(newmedia) != IFM_AUTO) &&
-		    (newmedia == ifm->ifm_media) &&
-		    (match == ifm->ifm_cur))
-			return 0;
+		if (IFM_SUBTYPE(newmedia) != IFM_AUTO &&
+		    newmedia == ifm->ifm_media && match == ifm->ifm_cur)
+			return (0);
 
 		/*
 		 * We found a match, now make the driver switch to it.
@@ -347,7 +346,7 @@ ifmedia_match(struct ifmedia *ifm, int target, int mas
 		}
 	}
 
-	return match;
+	return (match);
 }
 
 /*
@@ -363,7 +362,8 @@ ifmedia_baudrate(int mword)
 	int i;
 
 	for (i = 0; ifmedia_baudrate_descriptions[i].ifmb_word != 0; i++) {
-		if (IFM_TYPE_MATCH(mword, ifmedia_baudrate_descriptions[i].ifmb_word))
+		if (IFM_TYPE_MATCH(mword, ifmedia_baudrate_descriptions[i].
+		    ifmb_word))
 			return (ifmedia_baudrate_descriptions[i].ifmb_baudrate);
 	}
 


More information about the svn-src-stable-12 mailing list