[PATCH v5.2 03/12] linux/ioctls: use <linux/sockios.h> for sockios ioctls

[Adhemerval Zanella Netto]

On 27/05/25 19:08, H. Peter Anvin wrote:
> In the kernel, these are <linux/sockios.h>. The differences between
> <linux/sockios.h> and the copied data in <bits/ioctls.h> are minor;
> mainly some #ifdefs, so try to use <linux/sockios.h> directly; it is
> hopefully clean enough these days to use directly.
> 
> Signed-off-by: H. Peter Anvin <hpa@zytor.com>


LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> ---
>  sysdeps/unix/sysv/linux/bits/ioctls.h | 85 +--------------------------
>  1 file changed, 1 insertion(+), 84 deletions(-)
> 
> diff --git a/sysdeps/unix/sysv/linux/bits/ioctls.h b/sysdeps/unix/sysv/linux/bits/ioctls.h
> index 7e226e4e8f13..1ddcd4f45aea 100644
> --- a/sysdeps/unix/sysv/linux/bits/ioctls.h
> +++ b/sysdeps/unix/sysv/linux/bits/ioctls.h
> @@ -22,87 +22,4 @@
>  /* Use the definitions from the kernel header files.  */
>  #include <asm/ioctls.h>
>  
> -/* Routing table calls.  */
> -#define SIOCADDRT	0x890B		/* add routing table entry	*/
> -#define SIOCDELRT	0x890C		/* delete routing table entry	*/
> -#define SIOCRTMSG	0x890D		/* call to routing system	*/
> -
> -/* Socket configuration controls. */
> -#define SIOCGIFNAME	0x8910		/* get iface name		*/
> -#define SIOCSIFLINK	0x8911		/* set iface channel		*/
> -#define SIOCGIFCONF	0x8912		/* get iface list		*/
> -#define SIOCGIFFLAGS	0x8913		/* get flags			*/
> -#define SIOCSIFFLAGS	0x8914		/* set flags			*/
> -#define SIOCGIFADDR	0x8915		/* get PA address		*/
> -#define SIOCSIFADDR	0x8916		/* set PA address		*/
> -#define SIOCGIFDSTADDR	0x8917		/* get remote PA address	*/
> -#define SIOCSIFDSTADDR	0x8918		/* set remote PA address	*/
> -#define SIOCGIFBRDADDR	0x8919		/* get broadcast PA address	*/
> -#define SIOCSIFBRDADDR	0x891a		/* set broadcast PA address	*/
> -#define SIOCGIFNETMASK	0x891b		/* get network PA mask		*/
> -#define SIOCSIFNETMASK	0x891c		/* set network PA mask		*/
> -#define SIOCGIFMETRIC	0x891d		/* get metric			*/
> -#define SIOCSIFMETRIC	0x891e		/* set metric			*/
> -#define SIOCGIFMEM	0x891f		/* get memory address (BSD)	*/
> -#define SIOCSIFMEM	0x8920		/* set memory address (BSD)	*/
> -#define SIOCGIFMTU	0x8921		/* get MTU size			*/
> -#define SIOCSIFMTU	0x8922		/* set MTU size			*/
> -#define SIOCSIFNAME	0x8923		/* set interface name		*/
> -#define	SIOCSIFHWADDR	0x8924		/* set hardware address 	*/
> -#define SIOCGIFENCAP	0x8925		/* get/set encapsulations       */
> -#define SIOCSIFENCAP	0x8926
> -#define SIOCGIFHWADDR	0x8927		/* Get hardware address		*/
> -#define SIOCGIFSLAVE	0x8929		/* Driver slaving support	*/
> -#define SIOCSIFSLAVE	0x8930
> -#define SIOCADDMULTI	0x8931		/* Multicast address lists	*/
> -#define SIOCDELMULTI	0x8932
> -#define SIOCGIFINDEX	0x8933		/* name -> if_index mapping	*/
> -#define SIOGIFINDEX	SIOCGIFINDEX	/* misprint compatibility :-)	*/
> -#define SIOCSIFPFLAGS	0x8934		/* set/get extended flags set	*/
> -#define SIOCGIFPFLAGS	0x8935
> -#define SIOCDIFADDR	0x8936		/* delete PA address		*/
> -#define	SIOCSIFHWBROADCAST	0x8937	/* set hardware broadcast addr	*/
> -#define SIOCGIFCOUNT	0x8938		/* get number of devices */
> -
> -#define SIOCGIFBR	0x8940		/* Bridging support		*/
> -#define SIOCSIFBR	0x8941		/* Set bridging options 	*/
> -
> -#define SIOCGIFTXQLEN	0x8942		/* Get the tx queue length	*/
> -#define SIOCSIFTXQLEN	0x8943		/* Set the tx queue length 	*/
> -
> -
> -/* ARP cache control calls. */
> -		    /*  0x8950 - 0x8952  * obsolete calls, don't re-use */
> -#define SIOCDARP	0x8953		/* delete ARP table entry	*/
> -#define SIOCGARP	0x8954		/* get ARP table entry		*/
> -#define SIOCSARP	0x8955		/* set ARP table entry		*/
> -
> -/* RARP cache control calls. */
> -#define SIOCDRARP	0x8960		/* delete RARP table entry	*/
> -#define SIOCGRARP	0x8961		/* get RARP table entry		*/
> -#define SIOCSRARP	0x8962		/* set RARP table entry		*/
> -
> -/* Driver configuration calls */
> -
> -#define SIOCGIFMAP	0x8970		/* Get device parameters	*/
> -#define SIOCSIFMAP	0x8971		/* Set device parameters	*/
> -
> -/* DLCI configuration calls */
> -
> -#define SIOCADDDLCI	0x8980		/* Create new DLCI device	*/
> -#define SIOCDELDLCI	0x8981		/* Delete DLCI device		*/
> -
> -/* Device private ioctl calls.  */
> -
> -/* These 16 ioctls are available to devices via the do_ioctl() device
> -   vector.  Each device should include this file and redefine these
> -   names as their own. Because these are device dependent it is a good
> -   idea _NOT_ to issue them to random objects and hope.  */
> -
> -#define SIOCDEVPRIVATE 		0x89F0	/* to 89FF */
> -
> -/*
> - *	These 16 ioctl calls are protocol private
> - */
> -
> -#define SIOCPROTOPRIVATE 0x89E0 /* to 89EF */
> +#include <linux/sockios.h>