Development discussion of WireGuard
 help / color / mirror / Atom feed
* [PATCH] address kernel commit 0a833c29d89656025443cb9f0ebff7052dd95ce0
@ 2017-11-25 20:59 Alexander Kappner
  2017-11-26  1:22 ` Jason A. Donenfeld
  0 siblings, 1 reply; 2+ messages in thread
From: Alexander Kappner @ 2017-11-25 20:59 UTC (permalink / raw)
  To: wireguard

The above-referenced commit in Linus'
tree changed the prototype of genl_dump_check_consistent in netlink.h. This
patch updates netlink.c in WG accordingly so WG builds against the latest
tree.

---
 src/netlink.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/netlink.c b/src/netlink.c
index 7fa243e..43e5ce0 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -177,7 +177,7 @@ static int get_device_dump(struct sk_buff *skb, struct netlink_callback *cb)
 	hdr = genlmsg_put(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, &genl_family, NLM_F_MULTI, WG_CMD_GET_DEVICE);
 	if (!hdr)
 		goto out;
-	genl_dump_check_consistent(cb, hdr, &genl_family);
+	genl_dump_check_consistent(cb, hdr);
 
 	if (!last_peer_cursor) {
 		if (nla_put_u16(skb, WGDEVICE_A_LISTEN_PORT, wg->incoming_port) || nla_put_u32(skb, WGDEVICE_A_FWMARK, wg->fwmark) || nla_put_u32(skb, WGDEVICE_A_IFINDEX, wg->dev->ifindex) || nla_put_string(skb, WGDEVICE_A_IFNAME, wg->dev->name))
-- 
2.1.4

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] address kernel commit 0a833c29d89656025443cb9f0ebff7052dd95ce0
  2017-11-25 20:59 [PATCH] address kernel commit 0a833c29d89656025443cb9f0ebff7052dd95ce0 Alexander Kappner
@ 2017-11-26  1:22 ` Jason A. Donenfeld
  0 siblings, 0 replies; 2+ messages in thread
From: Jason A. Donenfeld @ 2017-11-26  1:22 UTC (permalink / raw)
  To: Alexander Kappner; +Cc: WireGuard mailing list

Hi Alexander,

Thanks for the patch. I have something similar to this queued up for
when 4.15-rc1 lands, which should be pretty soon. At that point expect
to see this land in addition to compat layers for <4.15.

Jason

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-11-26  1:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-25 20:59 [PATCH] address kernel commit 0a833c29d89656025443cb9f0ebff7052dd95ce0 Alexander Kappner
2017-11-26  1:22 ` Jason A. Donenfeld

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).