From owner-svn-src-all@freebsd.org Sat Dec 28 06:56:22 2019 Return-Path: Delivered-To: svn-src-all@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 A1AAA1DDFA4; Sat, 28 Dec 2019 06:56:22 +0000 (UTC) (envelope-from adrian@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) server-signature RSA-PSS (4096 bits) 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 47lDxf3pl4z3LrC; Sat, 28 Dec 2019 06:56:22 +0000 (UTC) (envelope-from adrian@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 7DDDC254C6; Sat, 28 Dec 2019 06:56:22 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBS6uMrM012341; Sat, 28 Dec 2019 06:56:22 GMT (envelope-from adrian@FreeBSD.org) Received: (from adrian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBS6uL6X012337; Sat, 28 Dec 2019 06:56:21 GMT (envelope-from adrian@FreeBSD.org) Message-Id: <201912280656.xBS6uL6X012337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adrian set sender to adrian@FreeBSD.org using -f From: Adrian Chadd Date: Sat, 28 Dec 2019 06:56:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356145 - head/sys/mips/atheros X-SVN-Group: head X-SVN-Commit-Author: adrian X-SVN-Commit-Paths: head/sys/mips/atheros X-SVN-Commit-Revision: 356145 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Dec 2019 06:56:22 -0000 Author: adrian Date: Sat Dec 28 06:56:21 2019 New Revision: 356145 URL: https://svnweb.freebsd.org/changeset/base/356145 Log: [ar71xx] generate a random mac address using eth_gen_addr() This removes a hard-coded random mac address generator and uses the (not so) new system routine. Tested: * TP-Link WDR-4300 (AR934x + AR9580) Modified: head/sys/mips/atheros/ar71xx_macaddr.c head/sys/mips/atheros/ar71xx_macaddr.h head/sys/mips/atheros/if_arge.c Modified: head/sys/mips/atheros/ar71xx_macaddr.c ============================================================================== --- head/sys/mips/atheros/ar71xx_macaddr.c Sat Dec 28 05:28:29 2019 (r356144) +++ head/sys/mips/atheros/ar71xx_macaddr.c Sat Dec 28 06:56:21 2019 (r356145) @@ -93,18 +93,9 @@ ar71xx_mac_addr_init(unsigned char *dst, const unsigne * Returns 0 on success, -1 on error. */ int -ar71xx_mac_addr_random_init(unsigned char *dst) +ar71xx_mac_addr_random_init(struct ifnet *ifp, struct ether_addr *dst) { - uint32_t rnd; - rnd = arc4random(); - - dst[0] = 'b'; - dst[1] = 's'; - dst[2] = 'd'; - dst[3] = (rnd >> 24) & 0xff; - dst[4] = (rnd >> 16) & 0xff; - dst[5] = (rnd >> 8) & 0xff; - + ether_gen_addr(ifp, dst); return (0); } Modified: head/sys/mips/atheros/ar71xx_macaddr.h ============================================================================== --- head/sys/mips/atheros/ar71xx_macaddr.h Sat Dec 28 05:28:29 2019 (r356144) +++ head/sys/mips/atheros/ar71xx_macaddr.h Sat Dec 28 06:56:21 2019 (r356145) @@ -34,6 +34,6 @@ extern uint8_t ar71xx_board_mac_addr[ETHER_ADDR_LEN]; extern int ar71xx_mac_addr_init(unsigned char *dst, const unsigned char *src, int offset, int is_local); -extern int ar71xx_mac_addr_random_init(unsigned char *dst); +extern int ar71xx_mac_addr_random_init(struct ifnet *ifp, struct ether_addr *dst); #endif /* __ATHEROS_AR71XX_MACADDR_H__ */ Modified: head/sys/mips/atheros/if_arge.c ============================================================================== --- head/sys/mips/atheros/if_arge.c Sat Dec 28 05:28:29 2019 (r356144) +++ head/sys/mips/atheros/if_arge.c Sat Dec 28 06:56:21 2019 (r356145) @@ -876,7 +876,11 @@ arge_attach(device_t dev) if (bootverbose) device_printf(dev, "Generating random ethernet address.\n"); - (void) ar71xx_mac_addr_random_init(sc->arge_eaddr); + if (ar71xx_mac_addr_random_init(ifp, (void *) sc->arge_eaddr) < 0) { + device_printf(dev, "Failed to choose random MAC address\n"); + error = EINVAL; + goto fail; + } } if (arge_dma_alloc(sc) != 0) {