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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to