Update the list of files where networking ioctls are defined and update
the ranges of function numbers that are used.

Signed-off-by: Randy Dunlap <[email protected]>
---
[Since having multiple maintainers trying to merge these would
cause some conflicts, it would be more manageable for Jon to
take all of these through the docs-next tree.]

Cc: Jonathan Corbet <[email protected]>
Cc: Shuah Khan <[email protected]>
Cc: [email protected]
Cc: Marcel Holtmann <[email protected]>
Cc: Luiz Augusto von Dentz <[email protected]>
Cc: [email protected]
Cc: Willem de Bruijn <[email protected]>
Cc: Jason Wang <[email protected]>
Cc: David Heidelberg <[email protected]>
Cc: [email protected]
Cc: Chas Williams <[email protected]>
Cc: [email protected]
Cc: "David S. Miller" <[email protected]>
Cc: Eric Dumazet <[email protected]>
Cc: Jakub Kicinski <[email protected]>
Cc: Paolo Abeni <[email protected]>
Cc: [email protected]

 Documentation/userspace-api/ioctl/ioctl-number.rst |   19 +++++++----
 1 file changed, 13 insertions(+), 6 deletions(-)

--- linux-next-20261111.orig/Documentation/userspace-api/ioctl/ioctl-number.rst
+++ linux-next-20261111/Documentation/userspace-api/ioctl/ioctl-number.rst
@@ -132,6 +132,7 @@ Code  Seq#    Include File
 'B'   00-0F  include/linux/pmu.h                                       
conflict!
 'B'   C0-FF  advanced bbus                                             
<mailto:[email protected]>
 'B'   00-0F  xen/xenbus_dev.h                                          
conflict!
+'B'   C8-D4  net/bluetooth/bnep/bnep.h                                 
<mailto:[email protected]>
 'C'   all    linux/soundcard.h                                         
conflict!
 'C'   00-68  sound/compress_offload.h                                  
conflict!
 'C'   01-2F  linux/capi.h                                              
conflict!
@@ -173,7 +174,7 @@ Code  Seq#    Include File
 'H'   FC     sound/pci/asihpi/hpios.h                                  
conflict!
 'H'   00-0F  uapi/misc/habanalabs.h                                    
conflict!
 'H'   A0     uapi/linux/usb/cdc-wdm.h
-'H'   C0-F0  net/bluetooth/hci.h                                       
conflict!
+'H'   C0-F0  net/bluetooth/hci_sock.h                                  
conflict!
 'H'   C0-DF  net/bluetooth/hidp/hidp.h                                 
conflict!
 'H'   C0-DF  net/bluetooth/cmtp/cmtp.h                                 
conflict!
 'H'   C0-DF  net/bluetooth/bnep/bnep.h                                 
conflict!
@@ -219,11 +220,12 @@ Code  Seq#    Include File
 'T'   all    linux/soundcard.h                                         
conflict!
 'T'   00-AF  sound/asound.h                                            
conflict!
 'T'   all    arch/x86/include/asm/ioctls.h                             
conflict!
-'T'   C0-DF  linux/if_tun.h                                            
conflict!
+'T'   C0-E3  linux/if_tun.h                                            
conflict!
 'U'   all    sound/asound.h                                            
conflict!
 'U'   00-CF  linux/uinput.h                                            
conflict!
 'U'   00-EF  linux/usbdevice_fs.h
 'U'   C0-CF  drivers/bluetooth/hci_uart.h
+'U'   00     net/nfc/nci_core.h                                        
conflict!
 'V'   all    linux/vt.h                                                
conflict!
 'V'   all    linux/videodev2.h                                         
conflict!
 'V'   C0     linux/ivtvfb.h                                            
conflict!
@@ -242,8 +244,8 @@ Code  Seq#    Include File
 'Z'   14-15  drivers/message/fusion/mptctl.h
 '['   00-3F  linux/usb/tmc.h                                           USB 
Test and Measurement Devices
                                                                        
<mailto:[email protected]>
-'a'   all    linux/atm*.h, linux/sonet.h                               ATM on 
linux
-                                                                       
<http://lrcwww.epfl.ch/>
+'a'   all    linux/atm*.h, linux/sonet.h, linux/atmbr2684.h            ATM on 
linux
+             linux/atmdev.h, net/atm/ioctl.c                           
<http://lrcwww.epfl.ch/>
 'b'   00-FF                                                            
conflict! bit3 vme host bridge
                                                                        
<mailto:[email protected]>
 'b'   00-0F  linux/dma-buf.h                                           
conflict!
@@ -264,6 +266,7 @@ Code  Seq#    Include File
 'f'   00-0F  fs/ocfs2/ocfs2_fs.h                                       
conflict!
 'f'   13-27  linux/fscrypt.h
 'f'   81-8F  linux/fsverity.h
+'f'   7b-7c  arch/{alpha,mips,sh,xtensa}/include/uapi/asm/sockios.h
 'g'   00-0F  linux/usb/gadgetfs.h
 'g'   20-2F  linux/usb/g_printer.h
 'g'   01-0F  mm/gup_test.h                                             
conflict!
@@ -308,8 +311,11 @@ Code  Seq#    Include File
 'q'   80-FF  linux/telephony.h                                         
Internet PhoneJACK, Internet LineJACK
              linux/ixjuser.h                                           
<http://web.archive.org/web/%2A/http://www.quicknet.net>
 'r'   00-1F  linux/msdos_fs.h and fs/fat/dir.c
-'s'   all    linux/cdk.h
+'s'   all    linux/cdk.h                                               
conflict!
+'s'   07-09  arch/{alpha,mips,sh,xtensa}/include/uapi/asm/sockios.h    
conflict!
+'s'   64-65  arch/sh/include/uapi/asm/sockios.h                        
conflict!
 't'   00-7F  linux/ppp-ioctl.h
+'t'   46-4D  drivers/net/ppp/ppp_generic.c
 't'   80-8F  linux/isdn_ppp.h
 't'   90-91  linux/toshiba.h                                           toshiba 
and toshiba_acpi SMM
 'u'   00-1F  linux/smb_fs.h                                            gone
@@ -334,7 +340,8 @@ Code  Seq#    Include File
 '|'   80-9F  samples/                                                  Any 
sample and example drivers
 0x80  00-1F  linux/fb.h
 0x81  00-1F  linux/vduse.h
-0x89  00-06  arch/x86/include/asm/sockios.h
+0x89  00-07  asm-generic/sockios.h
+0x89  06-07  linux/sockios.h
 0x89  0B-DF  linux/sockios.h
 0x89  E0-EF  linux/sockios.h                                           
SIOCPROTOPRIVATE range
 0x89  F0-FF  linux/sockios.h                                           
SIOCDEVPRIVATE range

Reply via email to