lkml.org 
[lkml]   [2018]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[RFC net-next 05/15] HACK: net: lora: Deal with .poll_mask in 4.18-rc2
Date
linux-next and 4.18-rc2 both identify as LINUX_VERSION(4,18,0), but
commit a11e1d432b51f63ba698d044441284a661f01144 (Revert changes to
convert to ->poll_mask() and aio IOCB_CMD_POLL) reverted .poll_mask
to .poll again.

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
net/lora/dgram.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/net/lora/dgram.c b/net/lora/dgram.c
index 4d931fd3778a..ef56fd90e762 100644
--- a/net/lora/dgram.c
+++ b/net/lora/dgram.c
@@ -217,7 +217,11 @@ const struct proto_ops dgram_proto_ops = {
.socketpair = sock_no_socketpair,
.accept = sock_no_accept,
.getname = dgram_getname,
+#if 0 /* LINUX_VERSION_CODE >= LINUX_VERSION(4, 18, 0) */
+ .poll_mask = datagram_poll_mask,
+#else
.poll = datagram_poll,
+#endif
.ioctl = dgram_ioctl,
.listen = sock_no_listen,
.shutdown = sock_no_shutdown,
--
2.16.4
\
 
 \ /
  Last update: 2018-07-01 13:13    [W:0.382 / U:0.616 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site