summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2013-10-20 14:09:13 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2013-10-23 19:38:57 +0200
commite8acf3936710c3466d49314407303f87a4e64535 (patch)
tree8dc3e4ff5fd8d4e79e37a2a261b45580eb009efc /patches/collateral-evolutions
parent46a102dbc4b35cb7a4e41b9e5959ce94224607cd (diff)
backports: do not use uapi in include
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'patches/collateral-evolutions')
-rw-r--r--patches/collateral-evolutions/network/79-no-uapi/INFO4
-rw-r--r--patches/collateral-evolutions/network/79-no-uapi/mwifiex.patch22
2 files changed, 26 insertions, 0 deletions
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 00000000..8e864772
--- /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 00000000..41e5c9d6
--- /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"