From ccd33650fab8e78c0f556efd6d4e3610837f16f7 Mon Sep 17 00:00:00 2001
From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 4 Mar 2018 23:57:17 +0100
Subject: backports: Add staging rtlwifi, rtl8188eu and rtl8723bs driver

This adds the staging Realtek drivers which are making use of cfg80211
and mac80211.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 patches/0084-disbale-some-staging-dirs.patch  | 13 +++++++++++++
 patches/0085-not-include-kmemleak.patch       | 11 +++++++++++
 patches/0086-rtl8723bs-no-extern-inline.patch | 26 ++++++++++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 patches/0084-disbale-some-staging-dirs.patch
 create mode 100644 patches/0085-not-include-kmemleak.patch
 create mode 100644 patches/0086-rtl8723bs-no-extern-inline.patch

(limited to 'patches')

diff --git a/patches/0084-disbale-some-staging-dirs.patch b/patches/0084-disbale-some-staging-dirs.patch
new file mode 100644
index 00000000..8947130d
--- /dev/null
+++ b/patches/0084-disbale-some-staging-dirs.patch
@@ -0,0 +1,13 @@
+--- a/drivers/staging/Makefile
++++ b/drivers/staging/Makefile
+@@ -1,8 +1,8 @@
+ # SPDX-License-Identifier: GPL-2.0
+ # Makefile for staging directory
+ 
+-obj-y				+= media/
+-obj-y				+= typec/
++#obj-y				+= media/
++#obj-y				+= typec/
+ obj-$(CONFIG_IPX)		+= ipx/
+ obj-$(CONFIG_NCP_FS)		+= ncpfs/
+ obj-$(CONFIG_IRDA)		+= irda/net/
diff --git a/patches/0085-not-include-kmemleak.patch b/patches/0085-not-include-kmemleak.patch
new file mode 100644
index 00000000..def245d4
--- /dev/null
+++ b/patches/0085-not-include-kmemleak.patch
@@ -0,0 +1,11 @@
+--- a/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
++++ b/drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c
+@@ -13,7 +13,7 @@
+  *
+  ******************************************************************************/
+ #define _RTL8188EU_RECV_C_
+-#include <linux/kmemleak.h>
++#include <linux/slab.h>
+ #include <osdep_service.h>
+ #include <drv_types.h>
+ #include <recv_osdep.h>
diff --git a/patches/0086-rtl8723bs-no-extern-inline.patch b/patches/0086-rtl8723bs-no-extern-inline.patch
new file mode 100644
index 00000000..cc8bba0a
--- /dev/null
+++ b/patches/0086-rtl8723bs-no-extern-inline.patch
@@ -0,0 +1,26 @@
+diff --git a/drivers/staging/rtl8723bs/include/ieee80211.h b/drivers/staging/rtl8723bs/include/ieee80211.h
+index 73ce637..fa9c80f 100644
+--- a/drivers/staging/rtl8723bs/include/ieee80211.h
++++ b/drivers/staging/rtl8723bs/include/ieee80211.h
+@@ -1008,18 +1008,18 @@ enum ieee80211_state {
+ #define IP_FMT "%pI4"
+ #define IP_ARG(x) (x)
+ 
+-extern __inline int is_multicast_mac_addr(const u8 *addr)
++static inline int is_multicast_mac_addr(const u8 *addr)
+ {
+         return ((addr[0] != 0xff) && (0x01 & addr[0]));
+ }
+ 
+-extern __inline int is_broadcast_mac_addr(const u8 *addr)
++static inline int is_broadcast_mac_addr(const u8 *addr)
+ {
+ 	return ((addr[0] == 0xff) && (addr[1] == 0xff) && (addr[2] == 0xff) &&   \
+ 		(addr[3] == 0xff) && (addr[4] == 0xff) && (addr[5] == 0xff));
+ }
+ 
+-extern __inline int is_zero_mac_addr(const u8 *addr)
++static inline int is_zero_mac_addr(const u8 *addr)
+ {
+ 	return ((addr[0] == 0x00) && (addr[1] == 0x00) && (addr[2] == 0x00) &&   \
+ 		(addr[3] == 0x00) && (addr[4] == 0x00) && (addr[5] == 0x00));
-- 
cgit v1.2.3