| Message ID | 20170424200331.21660-1-linus.luessing@c0d3.blue (mailing list archive) |
|---|---|
| State | Rejected, archived |
| Delegated to: | Simon Wunderlich |
| Headers |
Return-Path: <b.a.t.m.a.n-bounces@lists.open-mesh.org> 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 B08F9835C9; Mon, 24 Apr 2017 22:03:40 +0200 (CEST) Authentication-Results: open-mesh.org; dmarc=none header.from=c0d3.blue Received-SPF: None (no SPF record) identity=mailfrom; client-ip=138.201.29.205; helo=mail.aperture-lab.de; envelope-from=linus.luessing@c0d3.blue; receiver=b.a.t.m.a.n@lists.open-mesh.org Authentication-Results: open-mesh.org; dmarc=none header.from=c0d3.blue X-Greylist: delayed 2159 seconds by postgrey-1.35 at open-mesh.org; Mon, 24 Apr 2017 22:03:37 CEST Received: from mail.aperture-lab.de (mail.aperture-lab.de [138.201.29.205]) by open-mesh.org (Postfix) with ESMTPS id AB933833A9 for <b.a.t.m.a.n@lists.open-mesh.org>; Mon, 24 Apr 2017 22:03:37 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.aperture-lab.de (Postfix) with ESMTP id A9E22E05EF; Mon, 24 Apr 2017 22:03:37 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aperture-lab.de Received: from mail.aperture-lab.de ([127.0.0.1]) by localhost (mail.aperture-lab.de [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id nD8M5cba2oaf; Mon, 24 Apr 2017 22:03:37 +0200 (CEST) Received: from localhost (unknown [193.96.224.42]) (Authenticated sender: linus.luessing@c0d3.blue) by mail.aperture-lab.de (Postfix) with ESMTPSA; Mon, 24 Apr 2017 22:03:36 +0200 (CEST) From: =?utf-8?q?Linus_L=C3=BCssing?= <linus.luessing@c0d3.blue> To: b.a.t.m.a.n@lists.open-mesh.org Date: Mon, 24 Apr 2017 22:03:31 +0200 Message-Id: <20170424200331.21660-1-linus.luessing@c0d3.blue> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Manoj Srivastava <srivasta@debian.org>, "Dmitry V . Levin" <ldv@altlinux.org> Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: compat: fix compilation for kernels >= 4.11 on Debian 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 <b.a.t.m.a.n.lists.open-mesh.org> List-Unsubscribe: <https://lists.open-mesh.org/mm/options/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=unsubscribe> List-Archive: <http://lists.open-mesh.org/pipermail/b.a.t.m.a.n/> List-Post: <mailto:b.a.t.m.a.n@lists.open-mesh.org> List-Help: <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=help> List-Subscribe: <https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n>, <mailto:b.a.t.m.a.n-request@lists.open-mesh.org?subject=subscribe> Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking <b.a.t.m.a.n@lists.open-mesh.org> Errors-To: b.a.t.m.a.n-bounces@lists.open-mesh.org Sender: "B.A.T.M.A.N" <b.a.t.m.a.n-bounces@lists.open-mesh.org> |
Commit Message
Linus Lüssing
April 24, 2017, 8:03 p.m. UTC
This patch is a workaround for the following issue:
[...]/batman-adv/build/net/batman-adv/../../../compat-sources/net/core/skbuff.o
./include/linux/if.h:27:11: error: unable to open 'sys/socket.h'
In file included from ./include/linux/compat.h:16:0,
from ./include/linux/ethtool.h:16,
from [...]/batman-adv/build/../compat-include/linux/ethtool.h:25,
from ./include/linux/netdevice.h:42,
from [...]/batman-adv/build/../compat-include/linux/netdevice.h:25,
from ./include/linux/icmpv6.h:12,
from ./include/linux/ipv6.h:82,
from [...]/batman-adv/build/net/batman-adv/../../../compat-sources/net/core/skbuff.c:36:
./include/linux/if.h:27:54: fatal error: sys/socket.h: No such file or directory
#include <sys/socket.h> /* for struct sockaddr. */
It seems to occur since:
"uapi: fix linux/if.h userspace compilation errors"
(2618be7dcc, Linux 4.11-rc1)
Simply including an empty sys/socket.h makes the kernel module compile
again. (The #ifndef __KERNEL__, which kernel-package / make-kpkg
stripped, should have removed this include for kernel modules anyway.)
Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
---
Fixes:
- https://www.open-mesh.org/issues/333
---
compat-include/sys/socket.h | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 compat-include/sys/socket.h
Comments
On Montag, 24. April 2017 22:03:31 CEST Linus Lüssing wrote: [...] > It seems to occur since: > > "uapi: fix linux/if.h userspace compilation errors" > (2618be7dcc, Linux 4.11-rc1) > > Simply including an empty sys/socket.h makes the kernel module compile > again. (The #ifndef __KERNEL__, which kernel-package / make-kpkg > stripped, should have removed this include for kernel modules anyway.) Hm, sounds again like something which should be fixed somewhere else (not by batman-adv), right? Kind regards, Sven
diff --git a/compat-include/sys/socket.h b/compat-include/sys/socket.h new file mode 100644 index 0000000..8722e57 --- /dev/null +++ b/compat-include/sys/socket.h @@ -0,0 +1,3 @@ +/* + * Workaround for Debian's kernel-package + */