[RFC net-next 05/15] HACK: net: lora: Deal with .poll_mask in 4.18-rc2
From: jiri@resnulli.us (Jiri Pirko)
Date: 2018-07-02 16:24:19
Also in:
lkml, netdev
Sun, Jul 01, 2018 at 01:07:54PM CEST, afaerber at suse.de wrote:
quoted hunk ↗ jump to hunk
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
I guess that you sent this patch by mistake...
.poll = datagram_poll, +#endif .ioctl = dgram_ioctl, .listen = sock_no_listen, .shutdown = sock_no_shutdown, -- 2.16.4