Skip to content

Commit 5fe5a75

Browse files
palmer-dabbeltarndb
authored andcommitted
Move COMPAT_ATM_ADDPARTY to net/atm/svc.c
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 <[email protected]> Reviewed-by: Andrew Waterman <[email protected]> Reviewed-by: Albert Ou <[email protected]> Message-Id: <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Signed-off-by: Thomas Huth <[email protected]> Signed-off-by: Arnd Bergmann <[email protected]>
1 parent fe15c26 commit 5fe5a75

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

include/uapi/linux/atmdev.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ struct atm_dev_stats {
101101
/* use backend to make new if */
102102
#define ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct atm_iobuf)
103103
/* add party to p2mp call */
104-
#ifdef CONFIG_COMPAT
105-
/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */
106-
#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL+4,struct compat_atm_iobuf)
107-
#endif
108104
#define ATM_DROPPARTY _IOW('a', ATMIOC_SPECIAL+5,int)
109105
/* drop party from p2mp call */
110106

net/atm/svc.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
#include "signaling.h"
2929
#include "addr.h"
3030

31+
#ifdef CONFIG_COMPAT
32+
/* It actually takes struct sockaddr_atmsvc, not struct atm_iobuf */
33+
#define COMPAT_ATM_ADDPARTY _IOW('a', ATMIOC_SPECIAL + 4, struct compat_atm_iobuf)
34+
#endif
35+
3136
static int svc_create(struct net *net, struct socket *sock, int protocol,
3237
int kern);
3338

0 commit comments

Comments
 (0)