public inbox for b.a.t.m.a.n@lists.open-mesh.org
 help / color / mirror / Atom feed
From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 6/6] batman-adv: compat: Map to linux/nl80211.h for Linux < 3.7
Date: Sun, 19 Nov 2017 17:12:07 +0100	[thread overview]
Message-ID: <20171119161207.32588-7-sven@narfation.org> (raw)
In-Reply-To: <20171119161207.32588-1-sven@narfation.org>

The uapi header of linux/nl80211.h was introduced with 3.7. Older version
have to rely on the linux/nl80211.h header.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 compat-include/uapi/linux/nl80211.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/compat-include/uapi/linux/nl80211.h b/compat-include/uapi/linux/nl80211.h
index 9b18178e..ead4c6dd 100644
--- a/compat-include/uapi/linux/nl80211.h
+++ b/compat-include/uapi/linux/nl80211.h
@@ -25,7 +25,11 @@
 #define _NET_BATMAN_ADV_COMPAT_UAPI_LINUX_NL80211_H_
 
 #include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
 #include_next <uapi/linux/nl80211.h>
+#else
+#include <linux/nl80211.h>
+#endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0)
 
-- 
2.11.0


  parent reply	other threads:[~2017-11-19 16:12 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-19 16:12 [B.A.T.M.A.N.] [PATCH 0/6] batman-adv: Include cleanup Sven Eckelmann
2017-11-19 16:12 ` [B.A.T.M.A.N.] [PATCH 1/6] batman-adv: include gfp.h for GFP_* defines Sven Eckelmann
2017-11-19 16:12 ` [B.A.T.M.A.N.] [PATCH 2/6] batman-adv: include build_bug.h for BUILD_BUG_ON define Sven Eckelmann
2017-11-19 16:12 ` [B.A.T.M.A.N.] [PATCH 3/6] batman-adv: Include net.h for net_ratelimited_function Sven Eckelmann
2017-11-19 16:12 ` [B.A.T.M.A.N.] [PATCH 4/6] batman-adv: include kobject.h for kobject_* functions Sven Eckelmann
2017-11-19 16:12 ` [B.A.T.M.A.N.] [PATCH 5/6] batman-adv: Remove unused sched.h include Sven Eckelmann
2017-11-19 16:12 ` Sven Eckelmann [this message]
2017-12-06 10:42 ` [B.A.T.M.A.N.] [PATCH 0/6] batman-adv: Include cleanup Sven Eckelmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171119161207.32588-7-sven@narfation.org \
    --to=sven@narfation.org \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox