Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 29 Mar 2018 15:58:49 +0000 (UTC)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r331737 - head/sys/dev/de
Message-ID:  <201803291558.w2TFwnRk071022@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: brooks
Date: Thu Mar 29 15:58:49 2018
New Revision: 331737
URL: https://svnweb.freebsd.org/changeset/base/331737

Log:
  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
  MFC after:	1 week
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D14889

Modified:
  head/sys/dev/de/if_de.c
  head/sys/dev/de/if_devar.h

Modified: head/sys/dev/de/if_de.c
==============================================================================
--- head/sys/dev/de/if_de.c	Thu Mar 29 15:12:03 2018	(r331736)
+++ head/sys/dev/de/if_de.c	Thu Mar 29 15:58:49 2018	(r331737)
@@ -4266,18 +4266,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: head/sys/dev/de/if_devar.h
==============================================================================
--- head/sys/dev/de/if_devar.h	Thu Mar 29 15:12:03 2018	(r331736)
+++ head/sys/dev/de/if_devar.h	Thu Mar 29 15:58:49 2018	(r331737)
@@ -876,11 +876,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

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803291558.w2TFwnRk071022>