Re: [PATCH 03/14] Move COMPAT_ATM_ADDPARTY to net/atm/svc.c

[Arnd Bergmann]

On Fri, Feb 10, 2023, at 15:55, Thomas Huth wrote:
> On 10/11/2015 02.31, Palmer Dabbelt wrote:
>> This used to be behind an #ifdef COMPAT_COMPAT, so most of userspace
>> wouldn't have seen the definition before.  Unfortunately this header
>> file became visible to userspace, so the definition has instead been
>> moved to net/atm/svc.c (the only user).
>> 
>> Signed-off-by: Palmer Dabbelt <palmer@xxxxxxxxxxx>
>> Reviewed-by: Andrew Waterman <waterman@xxxxxxxxxxxxxxxxx>
>> Reviewed-by: Albert Ou <aou@xxxxxxxxxxxxxxxxx>

Reviewed-by: Arnd Bergmann <arnd@xxxxxxxx>

It took me a bit to figure out why there is a separate command
code but no special handler for the compat structure, aside from
being in the wrong file it does look correct.

>> +#ifdef CONFIG_COMPAT
>> +/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */
>> +#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4, struct compat_atm_iobuf)
>> +#endif

We could actually drop the #ifdef here as well, or moving into
the existing #ifdef.

>> +
>>   static int svc_create(struct net *net, struct socket *sock, int protocol,
>>   		      int kern);
>
> The CONFIG_* switch is still there in the atmdev.h uapi header ... could 
> somebody please pick this patch up to fix it?

It should get merged through the netdev tree, as Chas does not have
a separate git tree for drivers/atm.

I don't know what happened to the rest of the series, but if there are
additional patches that got lost, merging them all through either the
asm-generic or the mm tree would work as well.

Any chance you or Palmer could rebase the series to 6.2-rc and
see what remains?

    Arnd