aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-07-03 18:13:11 +0200
committerFelix Fietkau <nbd@nbd.name>2016-07-03 18:13:11 +0200
commitf226d5879e9f38bbc0aabbaeca94622e2a4b0cee (patch)
tree7d72e09092e339304b5227befcdf660dc3f2acb1
parentb1748321597097d73b1806f096f9e4049a53b0ad (diff)
downloadupstream-f226d5879e9f38bbc0aabbaeca94622e2a4b0cee.tar.gz
upstream-f226d5879e9f38bbc0aabbaeca94622e2a4b0cee.tar.bz2
upstream-f226d5879e9f38bbc0aabbaeca94622e2a4b0cee.zip
mac80211: move include statements for skb_get_hash_perturb() to prevent issues with newer kernels
Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/kernel/mac80211/patches/005-backport_skb_get_hash_perturb.patch14
1 files changed, 4 insertions, 10 deletions
diff --git a/package/kernel/mac80211/patches/005-backport_skb_get_hash_perturb.patch b/package/kernel/mac80211/patches/005-backport_skb_get_hash_perturb.patch
index 8212910577..29bccc1e99 100644
--- a/package/kernel/mac80211/patches/005-backport_skb_get_hash_perturb.patch
+++ b/package/kernel/mac80211/patches/005-backport_skb_get_hash_perturb.patch
@@ -1,19 +1,13 @@
--- a/backport-include/linux/skbuff.h
+++ b/backport-include/linux/skbuff.h
-@@ -1,6 +1,8 @@
- #ifndef __BACKPORT_SKBUFF_H
- #define __BACKPORT_SKBUFF_H
- #include_next <linux/skbuff.h>
-+#include <net/flow_keys.h>
-+#include <linux/jhash.h>
- #include <linux/version.h>
- #include <generated/utsrelease.h>
-
-@@ -305,6 +307,16 @@ static inline void skb_free_frag(void *d
+@@ -305,6 +305,19 @@ static inline void skb_free_frag(void *d
{
put_page(virt_to_head_page(data));
}
+
++#include <net/flow_keys.h>
++#include <linux/jhash.h>
++
+static inline u32 skb_get_hash_perturb(struct sk_buff *skb, u32 key)
+{
+ struct flow_keys keys;