From e8acf3936710c3466d49314407303f87a4e64535 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 20 Oct 2013 14:09:13 +0200
Subject: [PATCH] backports: do not use uapi in include

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../network/79-no-uapi/INFO                   |  4 ++++
 .../network/79-no-uapi/mwifiex.patch          | 22 +++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/79-no-uapi/INFO
 create mode 100644 patches/collateral-evolutions/network/79-no-uapi/mwifiex.patch

diff --git a/patches/collateral-evolutions/network/79-no-uapi/INFO b/patches/collateral-evolutions/network/79-no-uapi/INFO
new file mode 100644
index 000000000000..8e864772114e
--- /dev/null
+++ b/patches/collateral-evolutions/network/79-no-uapi/INFO
@@ -0,0 +1,4 @@
+Older kernel versions do not have the uapi include directory, but they 
+have the same functions in the include file without uapi. On recent 
+kernel versions the include file without uapi in the name includes the 
+uapi one.
diff --git a/patches/collateral-evolutions/network/79-no-uapi/mwifiex.patch b/patches/collateral-evolutions/network/79-no-uapi/mwifiex.patch
new file mode 100644
index 000000000000..41e5c9d62e89
--- /dev/null
+++ b/patches/collateral-evolutions/network/79-no-uapi/mwifiex.patch
@@ -0,0 +1,22 @@
+--- a/drivers/net/wireless/mwifiex/decl.h
++++ b/drivers/net/wireless/mwifiex/decl.h
+@@ -26,7 +26,7 @@
+ #include <linux/wait.h>
+ #include <linux/timer.h>
+ #include <linux/ieee80211.h>
+-#include <uapi/linux/if_arp.h>
++#include <linux/if_arp.h>
+ #include <net/mac80211.h>
+ 
+ 
+--- a/drivers/net/wireless/mwifiex/sta_rx.c
++++ b/drivers/net/wireless/mwifiex/sta_rx.c
+@@ -17,7 +17,7 @@
+  * this warranty disclaimer.
+  */
+ 
+-#include <uapi/linux/ipv6.h>
++#include <linux/ipv6.h>
+ #include <net/ndisc.h>
+ #include "decl.h"
+ #include "ioctl.h"
-- 
2.30.2