[PATCH 4/5] backports: do not use uapi in include

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
---
 .../collateral-evolutions/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 0000000..8e86477
--- /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 0000000..41e5c9d
--- /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"
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux