Skip to content

Commit fd87b77

Browse files
pran005kuba-moo
authored andcommitted
net: Fix the devmem sock opts and msgs for parisc
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/20240910171458.219195-10-almasrymina@google.com/ Fixes: 8f0b3cc ("tcp: RX path for devmem TCP") Signed-off-by: Pranjal Shrivastava <praan@google.com> Reviewed-by: Willem de Bruijn <willemb@google.com> Reviewed-by: Jason Xing <kerneljasonxing@gmail.com> Reviewed-by: Mina Almasry <almasrymina@google.com> Link: https://patch.msgid.link/20250324074228.3139088-1-praan@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 1ae1d70 commit fd87b77

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -132,16 +132,16 @@
132132
#define SO_PASSPIDFD 0x404A
133133
#define SO_PEERPIDFD 0x404B
134134

135-
#define SO_DEVMEM_LINEAR 78
136-
#define SCM_DEVMEM_LINEAR SO_DEVMEM_LINEAR
137-
#define SO_DEVMEM_DMABUF 79
138-
#define SCM_DEVMEM_DMABUF SO_DEVMEM_DMABUF
139-
#define SO_DEVMEM_DONTNEED 80
140-
141135
#define SCM_TS_OPT_ID 0x404C
142136

143137
#define SO_RCVPRIORITY 0x404D
144138

139+
#define SO_DEVMEM_LINEAR 0x404E
140+
#define SCM_DEVMEM_LINEAR SO_DEVMEM_LINEAR
141+
#define SO_DEVMEM_DMABUF 0x404F
142+
#define SCM_DEVMEM_DMABUF SO_DEVMEM_DMABUF
143+
#define SO_DEVMEM_DONTNEED 0x4050
144+
145145
#if !defined(__KERNEL__)
146146

147147
#if __BITS_PER_LONG == 64

0 commit comments

Comments
 (0)