From owner-svn-src-stable-12@freebsd.org Sun Nov 8 01:00:11 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 385782D7FA6; Sun, 8 Nov 2020 01:00:11 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CTG4q1B5Nz4XJt; Sun, 8 Nov 2020 01:00:11 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1BF6317AD5; Sun, 8 Nov 2020 01:00:11 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0A810AjG091237; Sun, 8 Nov 2020 01:00:10 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0A810Aep091236; Sun, 8 Nov 2020 01:00:10 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202011080100.0A810Aep091236@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 8 Nov 2020 01:00:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r367471 - stable/12/sys/net X-SVN-Group: stable-12 X-SVN-Commit-Author: kib X-SVN-Commit-Paths: stable/12/sys/net X-SVN-Commit-Revision: 367471 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2020 01:00:11 -0000 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); }