svn commit: r332290 - stable/11/sys/dev/de

[Rodney W. Grimes]

[ Charset UTF-8 unsupported, converting... ]
> Author: brooks
> Date: Sun Apr  8 16:59:39 2018
> New Revision: 332290
> URL: https://svnweb.freebsd.org/changeset/base/332290
> 
> 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/11/sys/dev/de/if_de.c
>   stable/11/sys/dev/de/if_devar.h
> Directory Properties:
>   stable/11/   (props changed)
> 
> Modified: stable/11/sys/dev/de/if_de.c
> ==============================================================================
> --- stable/11/sys/dev/de/if_de.c	Sun Apr  8 16:55:28 2018	(r332289)
> +++ stable/11/sys/dev/de/if_de.c	Sun Apr  8 16:59:39 2018	(r332290)
> @@ -4264,18 +4264,6 @@ tulip_ifioctl(struct ifnet * ifp, u_long cmd, caddr_t 
>  	    break;
>  	}
>  
> -#ifdef SIOCGADDRROM
> -	case SIOCGADDRROM: {
> -	    error = copyout(sc->tulip_rombuf, ifr_data_get_ptr(ifr), 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/11/sys/dev/de/if_devar.h
> ==============================================================================
> --- stable/11/sys/dev/de/if_devar.h	Sun Apr  8 16:55:28 2018	(r332289)
> +++ stable/11/sys/dev/de/if_devar.h	Sun Apr  8 16:59:39 2018	(r332290)
> @@ -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
> 
> 

-- 
Rod Grimes                                                 rgrimes at freebsd.org