From owner-svn-src-head@freebsd.org Tue Sep 1 21:39:57 2020 Return-Path: Delivered-To: svn-src-head@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 A5CE837AFAD; Tue, 1 Sep 2020 21:39:57 +0000 (UTC) (envelope-from mjg@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 4Bh0pj3zwKz4Pdw; Tue, 1 Sep 2020 21:39:57 +0000 (UTC) (envelope-from mjg@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 6C24C1FE77; Tue, 1 Sep 2020 21:39:57 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081Ldvvr032890; Tue, 1 Sep 2020 21:39:57 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081Lduuw032885; Tue, 1 Sep 2020 21:39:56 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012139.081Lduuw032885@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:39:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365112 - head/sys/dev/an X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/dev/an X-SVN-Commit-Revision: 365112 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:39:57 -0000 Author: mjg Date: Tue Sep 1 21:39:56 2020 New Revision: 365112 URL: https://svnweb.freebsd.org/changeset/base/365112 Log: an: clean up empty lines in .c and .h files Modified: head/sys/dev/an/if_aironet_ieee.h head/sys/dev/an/if_an.c head/sys/dev/an/if_an_pccard.c head/sys/dev/an/if_an_pci.c head/sys/dev/an/if_anreg.h Modified: head/sys/dev/an/if_aironet_ieee.h ============================================================================== --- head/sys/dev/an/if_aironet_ieee.h Tue Sep 1 21:39:37 2020 (r365111) +++ head/sys/dev/an/if_aironet_ieee.h Tue Sep 1 21:39:56 2020 (r365112) @@ -152,7 +152,6 @@ struct an_rssi_entry { u_int8_t an_rss_dbm; }; - struct an_ltv_key { u_int16_t an_len; u_int16_t an_type; @@ -641,7 +640,6 @@ struct an_rxframe { u_int8_t an_addr4[6]; /* 0x2C */ u_int8_t an_gaplen; /* 0x32 */ } __packed; - /* Do not modify this unless you are modifying LEAP itself */ #define LEAP_USERNAME_MAX 32 Modified: head/sys/dev/an/if_an.c ============================================================================== --- head/sys/dev/an/if_an.c Tue Sep 1 21:39:37 2020 (r365111) +++ head/sys/dev/an/if_an.c Tue Sep 1 21:39:56 2020 (r365112) @@ -1259,7 +1259,6 @@ an_intr(void *xsc) return; } - static int an_cmd_struct(struct an_softc *sc, struct an_command *cmd, struct an_reply *reply) @@ -1572,7 +1571,6 @@ an_write_record(struct an_softc *sc, struct an_ltv_gen return(EIO); } - if (reply.an_status & AN_CMD_QUAL_MASK) { if_printf(sc->an_ifp, "failed to write RID 2 %x %x %x %x %x, %d\n", @@ -1842,7 +1840,6 @@ an_setdef(struct an_softc *sc, struct an_req *areq) return; } - /* Reinitialize the card. */ if (ifp->if_flags) an_init_locked(sc); @@ -2867,7 +2864,6 @@ an_start_locked(struct ifnet *ifp) bcopy((caddr_t)&sc->an_txbuf, &buf[0x44], tx_frame_802_3.an_tx_802_3_payload_len); - bzero(&an_tx_desc, sizeof(an_tx_desc)); an_tx_desc.an_offset = 0; an_tx_desc.an_eoc = 1; @@ -3044,7 +3040,6 @@ int an_sigitems; /* number of cached entries */ struct an_sigcache an_sigcache[MAXANCACHE]; /* array of cache entries */ int an_nextitem; /* index/# of entries */ - #endif /* control variables for cache filtering. Basic idea is @@ -3142,7 +3137,6 @@ an_cache_store(struct an_softc *sc, struct ether_heade * if table full, then we need to replace LRU entry */ else { - /* check for space in cache table * note: an_nextitem also holds number of entries * added in the cache table @@ -3183,7 +3177,6 @@ an_cache_store(struct an_softc *sc, struct ether_heade } bcopy( eh->ether_shost, sc->an_sigcache[cache_slot].macsrc, 6); - switch (an_cache_mode) { case DBM: if (sc->an_have_rssimap) { @@ -3553,7 +3546,6 @@ cmdreset(struct ifnet *ifp) FLASH_DELAY(sc, 1000); /* WAS 600 12/7/00 */ - if (!(status = WaitBusy(ifp, 100))) { if_printf(ifp, "Waitbusy hang AFTER RESET =%d\n", status); AN_UNLOCK(sc); @@ -3603,7 +3595,6 @@ flashgchar(struct ifnet *ifp, int matchbyte, int dwell int success = -1; struct an_softc *sc = ifp->if_softc; - do { rchar = CSR_READ_2(sc, AN_SW1(sc->mpi350)); @@ -3675,7 +3666,6 @@ flashpchar(struct ifnet *ifp, int byte, int dwelltime) dwelltime -= 50; echo = CSR_READ_2(sc, AN_SW1(sc->mpi350)); } while (dwelltime >= 0 && echo != byte); - CSR_WRITE_2(sc, AN_SW1(sc->mpi350), 0); Modified: head/sys/dev/an/if_an_pccard.c ============================================================================== --- head/sys/dev/an/if_an_pccard.c Tue Sep 1 21:39:37 2020 (r365111) +++ head/sys/dev/an/if_an_pccard.c Tue Sep 1 21:39:56 2020 (r365112) @@ -88,7 +88,6 @@ static device_method_t an_pccard_methods[] = { DEVMETHOD(device_attach, an_pccard_attach), DEVMETHOD(device_detach, an_detach), DEVMETHOD(device_shutdown, an_shutdown), - { 0, 0 } }; @@ -147,7 +146,7 @@ an_pccard_attach(device_t dev) error = an_attach(sc, flags); if (error) goto fail; - + /* * Must setup the interrupt after the an_attach to prevent racing. */ Modified: head/sys/dev/an/if_an_pci.c ============================================================================== --- head/sys/dev/an/if_an_pci.c Tue Sep 1 21:39:37 2020 (r365111) +++ head/sys/dev/an/if_an_pci.c Tue Sep 1 21:39:56 2020 (r365112) @@ -242,7 +242,7 @@ static int an_suspend_pci(device_t dev) { an_shutdown(dev); - + return (0); } Modified: head/sys/dev/an/if_anreg.h ============================================================================== --- head/sys/dev/an/if_anreg.h Tue Sep 1 21:39:37 2020 (r365111) +++ head/sys/dev/an/if_anreg.h Tue Sep 1 21:39:56 2020 (r365112) @@ -354,7 +354,6 @@ struct an_rxframe_802_3 { }; #define AN_RXGAP_MAX 8 - struct an_txframe_802_3 { /* * Transmit 802.3 header structure.