[PATCH 1/4] backports: Add rhashtable_lookup_get_insert_fast()

[PATCH 1/4] backports: Add rhashtable_lookup_get_insert_fast()

[Hauke Mehrtens]

rhashtable_lookup_get_insert_fast() was added in kernel 4.12 in Linux
upstream commit f9fe1c12d12 ("rhashtable: Add
rhashtable_lookup_get_insert_fast") It is now used by mac80211.

For kernel < 4.9 we already backport the complete rhashtable
implementation, so this is only needed for kernels more recent than 4.9.

This is copied from upstreamn Linux kernel.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/linux/rhashtable.h | 31 ++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 backport/backport-include/linux/rhashtable.h

diff --git a/backport/backport-include/linux/rhashtable.h b/backport/backport-include/linux/rhashtable.h
new file mode 100644
index 00000000..8e493bc5
--- /dev/null
+++ b/backport/backport-include/linux/rhashtable.h
@@ -0,0 +1,31 @@
+#ifndef __BACKPORT_RHASHTABLE_H
+#define __BACKPORT_RHASHTABLE_H
+#include_next <linux/rhashtable.h>
+#include <linux/version.h>
+
+#if LINUX_VERSION_IS_LESS(4,12,0)
+/**
+ * rhashtable_lookup_get_insert_fast - lookup and insert object into hash table
+ * @ht:		hash table
+ * @obj:	pointer to hash head inside object
+ * @params:	hash table parameters
+ *
+ * Just like rhashtable_lookup_insert_fast(), but this function returns the
+ * object if it exists, NULL if it did not and the insertion was successful,
+ * and an ERR_PTR otherwise.
+ */
+#define rhashtable_lookup_get_insert_fast LINUX_BACKPORT(rhashtable_lookup_get_insert_fast)
+static inline void *rhashtable_lookup_get_insert_fast(
+	struct rhashtable *ht, struct rhash_head *obj,
+	const struct rhashtable_params params)
+{
+	const char *key = rht_obj(ht, obj);
+
+	BUG_ON(ht->p.obj_hashfn);
+
+	return __rhashtable_insert_fast(ht, key + ht->p.key_offset, obj, params,
+					false);
+}
+#endif
+
+#endif /* __BACKPORT_RHASHTABLE_H */
-- 
2.20.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in

[PATCH 2/4] backports: Add smp_acquire__after_ctrl_dep()

[Hauke Mehrtens]

smp_acquire__after_ctrl_dep() was introduced in kernel 4.8 in upstream
Linux commit 33ac279677d ("locking/barriers: Introduce
smp_acquire__after_ctrl_dep()") and is used by backports lib-refcount.c
implementation now.

This just adds the default implementation to backports.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/backport-include/asm/barrier.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backport/backport-include/asm/barrier.h b/backport/backport-include/asm/barrier.h
index 9e1e1f11..bca05588 100644
--- a/backport/backport-include/asm/barrier.h
+++ b/backport/backport-include/asm/barrier.h
@@ -19,4 +19,8 @@
 #define smp_mb__after_atomic smp_mb__after_clear_bit
 #endif
 
+#ifndef smp_acquire__after_ctrl_dep
+#define smp_acquire__after_ctrl_dep()		smp_rmb()
+#endif
+
 #endif /* __BACKPORT_ASM_BARRIER_H */
-- 
2.20.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in

[PATCH 3/4] backports: Add missing include for brcmfmac

[Hauke Mehrtens]

When building against kernel 4.8, 3.14 and older, brcmfmac failed
because struct sk_buff was not declared in brcmfmac/bus.h. This is used
in the brcmf_bus_ops.txdata() callback.

I do not know why this was working before.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/0013-fix-makefile-includes/brcmfmac.patch | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 patches/0013-fix-makefile-includes/brcmfmac.patch

diff --git a/patches/0013-fix-makefile-includes/brcmfmac.patch b/patches/0013-fix-makefile-includes/brcmfmac.patch
new file mode 100644
index 00000000..9147c80f
--- /dev/null
+++ b/patches/0013-fix-makefile-includes/brcmfmac.patch
@@ -0,0 +1,13 @@
+brcmf_bus_ops.txdata() uses a paramater of type struct sk_buff which
+was not declared here when compiling against kernele 4.8 and older.
+
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
+@@ -17,6 +17,7 @@
+ #ifndef BRCMFMAC_BUS_H
+ #define BRCMFMAC_BUS_H
+ 
++#include <linux/skbuff.h>
+ #include "debug.h"
+ 
+ /* IDs of the 6 default common rings of msgbuf protocol */
-- 
2.20.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in

[PATCH 4/4] backports: Build CONFIG_MT7603E only for kernel >= 4.2

[Hauke Mehrtens]

The mt76 core driver makes use of struct page_frag_cache which was only
added with kernel 4.2, deactivate all modules of the mt76 driver on
older kernel versions. CONFIG_MT7603E was newly added in this kernel
version.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 dependencies | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dependencies b/dependencies
index 7361e60d..b2edad81 100644
--- a/dependencies
+++ b/dependencies
@@ -75,6 +75,7 @@ MT76x0U 4.2
 MT76x0E 4.2
 MT76x2E 4.2
 MT76x2U 4.2
+MT7603E 4.2
 
 # select_queue_fallback_t is missing
 RTL8723BS 3.14
-- 
2.20.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in