From patchwork Fri Apr 29 19:55:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 15997 Return-Path: X-Original-To: patchwork@open-mesh.org Delivered-To: patchwork@open-mesh.org Received: from open-mesh.org (localhost [IPv6:::1]) by open-mesh.org (Postfix) with ESMTP id 07076822D3; Fri, 29 Apr 2016 21:55:35 +0200 (CEST) Authentication-Results: open-mesh.org; dmarc=none header.from=narfation.org Authentication-Results: open-mesh.org; dkim=fail reason="verification failed; unprotected key" header.d=narfation.org header.i=@narfation.org header.b=dXB52nRk; dkim-adsp=fail (unprotected policy); dkim-atps=neutral Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2001:4d88:2000:7::2; helo=v3-1039.vlinux.de; envelope-from=sven@narfation.org; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dmarc=pass header.from=narfation.org Received: from v3-1039.vlinux.de (narfation.org [IPv6:2001:4d88:2000:7::2]) by open-mesh.org (Postfix) with ESMTPS id 81AD3804C3 for ; Fri, 29 Apr 2016 21:55:33 +0200 (CEST) Received: from sven-edge.localnet (p200300C593C12BFD0000000000002E16.dip0.t-ipconnect.de [IPv6:2003:c5:93c1:2bfd::2e16]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id 2E74E1100F1; Fri, 29 Apr 2016 21:55:33 +0200 (CEST) Authentication-Results: v3-1039.vlinux.de; dmarc=none header.from=narfation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=narfation.org; s=20121; t=1461959733; bh=lc5SxXyYUE/zamNAC6bxV2VHrrc5xapIAOl2Tb9vzaQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dXB52nRkTkad4y7xoT87AvgCvO9RD+fhJz7aCYD4JKsR7CtvQhHo1uluooom3eoB8 gmZKKpxFTlo711+9ZYP6orfM+l2yzrMkFwWSF2PfQL8W2APfFlGQFAXU1+KgX7uzv2 2BtQGMvLbtpIdvmv++ctnvPim1MI54ytCBNZYjNI= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Fri, 29 Apr 2016 21:55:32 +0200 Message-ID: <36550935.HMH55OGFCA@sven-edge> User-Agent: KMail/4.14.10 (Linux/4.5.0-1-amd64; KDE/4.14.14; x86_64; ; ) In-Reply-To: <1461875848-11720-4-git-send-email-andrew@lunn.ch> References: <1461875848-11720-1-git-send-email-andrew@lunn.ch> <1461875848-11720-4-git-send-email-andrew@lunn.ch> MIME-Version: 1.0 Subject: Re: [B.A.T.M.A.N.] [PATCH 03/10] batman-adv: add generic netlink query API to replace debugfs files X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" On Thursday 28 April 2016 22:37:21 Andrew Lunn wrote: [....] > +int batadv_algo_dump(struct sk_buff *msg, struct netlink_callback *cb) > +{ > + int portid = NETLINK_CB(cb->skb).portid; This doesn't build on older kernels because the name of this field was changed. Attached is a patch which should work(tm). This was already discussed here: https://lists.open-mesh.org/pipermail/b.a.t.m.a.n/2016-April/014880.html But there is now still the problem that info->snd_portid was previously called info->snd_pid. Also the genl_register_family_with_ops compat has to be added. Kind regards, Sven From: Sven Eckelmann Date: Fri, 29 Apr 2016 21:43:04 +0200 Subject: [PATCH] add NETLINK_CB portid backport hack --- compat-include/linux/netlink.h | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 compat-include/linux/netlink.h diff --git a/compat-include/linux/netlink.h b/compat-include/linux/netlink.h new file mode 100644 index 0000000..696f6da --- /dev/null +++ b/compat-include/linux/netlink.h @@ -0,0 +1,45 @@ +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see . + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_NETLINK_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_NETLINK_H_ + +#include +#include_next + +#include + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0) + +struct batadv_netlink_skb_parms { + struct ucred creds; /* Skb credentials */ + union { + __u32 portid; + __u32 pid; + }; + __u32 dst_group; +}; + +#undef NETLINK_CB +#define NETLINK_CB(skb) (*(struct batadv_netlink_skb_parms*)&((skb)->cb)) + +#endif /* < KERNEL_VERSION(3, 7, 0) */ + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NETLINK_H_ */