Skip to content

Commit cbc891f

Browse files
pran005jfvogel
authored andcommitted
net: Fix the devmem sock opts and msgs for parisc
commit fd87b7783802b45cdd261b273e6b2b792823064d upstream. The devmem socket options and socket control message definitions introduced in the TCP devmem series[1] incorrectly continued the socket definitions for arch/parisc. The UAPI change seems safe as there are currently no drivers that declare support for devmem TCP RX via PP_FLAG_ALLOW_UNREADABLE_NETMEM. Hence, fixing this UAPI should be safe. Fix the devmem socket options and socket control message definitions to reflect the series followed by arch/parisc. [1] https://lore.kernel.org/lkml/[email protected]/ Fixes: 8f0b3cc ("tcp: RX path for devmem TCP") Signed-off-by: Pranjal Shrivastava <[email protected]> Reviewed-by: Willem de Bruijn <[email protected]> Reviewed-by: Jason Xing <[email protected]> Reviewed-by: Mina Almasry <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Pranjal Shrivastava <[email protected]> Signed-off-by: Helge Deller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit f4ae68eae950201b26aeef31ca49e49c3c972acd) Signed-off-by: Jack Vogel <[email protected]>
1 parent 5b5caf2 commit cbc891f

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

arch/parisc/include/uapi/asm/socket.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,15 @@
132132
#define SO_PASSPIDFD 0x404A
133133
#define SO_PEERPIDFD 0x404B
134134

135-
#define SO_DEVMEM_LINEAR 78
135+
#define SCM_TS_OPT_ID 0x404C
136+
137+
#define SO_RCVPRIORITY 0x404D
138+
139+
#define SO_DEVMEM_LINEAR 0x404E
136140
#define SCM_DEVMEM_LINEAR SO_DEVMEM_LINEAR
137-
#define SO_DEVMEM_DMABUF 79
141+
#define SO_DEVMEM_DMABUF 0x404F
138142
#define SCM_DEVMEM_DMABUF SO_DEVMEM_DMABUF
139-
#define SO_DEVMEM_DONTNEED 80
143+
#define SO_DEVMEM_DONTNEED 0x4050
140144

141145
#if !defined(__KERNEL__)
142146

0 commit comments

Comments
 (0)