From owner-svn-src-stable@freebsd.org Sun Apr 8 17:03:40 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E5D65F91156; Sun, 8 Apr 2018 17:03:39 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 97D8F7E769; Sun, 8 Apr 2018 17:03:39 +0000 (UTC) (envelope-from brooks@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 92AB812BA5; Sun, 8 Apr 2018 17:03:39 +0000 (UTC) (envelope-from brooks@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w38H3duS014075; Sun, 8 Apr 2018 17:03:39 GMT (envelope-from brooks@FreeBSD.org) Received: (from brooks@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w38H3dgR014073; Sun, 8 Apr 2018 17:03:39 GMT (envelope-from brooks@FreeBSD.org) Message-Id: <201804081703.w38H3dgR014073@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brooks set sender to brooks@FreeBSD.org using -f From: Brooks Davis Date: Sun, 8 Apr 2018 17:03:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r332291 - stable/10/sys/dev/de X-SVN-Group: stable-10 X-SVN-Commit-Author: brooks X-SVN-Commit-Paths: stable/10/sys/dev/de X-SVN-Commit-Revision: 332291 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@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2018 17:03:40 -0000 Author: brooks Date: Sun Apr 8 17:03:39 2018 New Revision: 332291 URL: https://svnweb.freebsd.org/changeset/base/332291 Log: MFC r331737: GC never enabled support for SIOCGADDRROM and SIOCGCHIPID. When de(4) was imported in 1997 the world was not ready for these ioctls. In over 20 years that hasn't changed so it seems safe to assume their time will never come. Reviewed by: imp, jhb Approved by: CheriBSD Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D14889 Modified: stable/10/sys/dev/de/if_de.c stable/10/sys/dev/de/if_devar.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/dev/de/if_de.c ============================================================================== --- stable/10/sys/dev/de/if_de.c Sun Apr 8 16:59:39 2018 (r332290) +++ stable/10/sys/dev/de/if_de.c Sun Apr 8 17:03:39 2018 (r332291) @@ -4263,18 +4263,6 @@ tulip_ifioctl(struct ifnet * ifp, u_long cmd, caddr_t break; } -#ifdef SIOCGADDRROM - case SIOCGADDRROM: { - error = copyout(sc->tulip_rombuf, ifr->ifr_data, sizeof(sc->tulip_rombuf)); - break; - } -#endif -#ifdef SIOCGCHIPID - case SIOCGCHIPID: { - ifr->ifr_metric = (int) sc->tulip_chipid; - break; - } -#endif default: { error = ether_ioctl(ifp, cmd, data); break; Modified: stable/10/sys/dev/de/if_devar.h ============================================================================== --- stable/10/sys/dev/de/if_devar.h Sun Apr 8 16:59:39 2018 (r332290) +++ stable/10/sys/dev/de/if_devar.h Sun Apr 8 17:03:39 2018 (r332291) @@ -874,11 +874,6 @@ static const struct { #define TULIP_TXMAP_POSTSYNC(ri, di) \ _TULIP_MAP_SYNC(ri, di, BUS_DMASYNC_POSTWRITE) -#ifdef notyet -#define SIOCGADDRROM _IOW('i', 240, struct ifreq) /* get 128 bytes of ROM */ -#define SIOCGCHIPID _IOWR('i', 241, struct ifreq) /* get chipid */ -#endif - #if defined(TULIP_HDR_DATA) static tulip_softc_t *tulips[TULIP_MAX_DEVICES]; #endif