The flow_dissector patch did not apply backporting 3.15-rc1 kernel sources based on wireless-testing repository. Fixing up the patch.
Signed-off-by: Arend van Spriel <[email protected]> --- patches/backport-adjustments/flow_dissector.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/patches/backport-adjustments/flow_dissector.patch b/patches/backport-adjustments/flow_dissector.patch index a4278f4..3711211 100644 --- a/patches/backport-adjustments/flow_dissector.patch +++ b/patches/backport-adjustments/flow_dissector.patch @@ -1,6 +1,6 @@ --- a/compat/net-core-flow_dissector.c +++ b/compat/net-core-flow_dissector.c -@@ -177,229 +177,10 @@ ipv6: +@@ -177,229 +177,11 @@ flow->ip_proto = ip_proto; flow->ports = skb_flow_get_ports(skb, nhoff, ip_proto); @@ -11,7 +11,7 @@ return true; } EXPORT_SYMBOL(skb_flow_dissect); -- + -static u32 hashrnd __read_mostly; -static __always_inline void __flow_hash_secret_init(void) -{ @@ -32,8 +32,8 @@ - -/* - * __skb_get_hash: calculate a flow hash based on src/dst addresses -- * and src/dst port numbers. Sets rxhash in skb to non-zero hash value -- * on success, zero indicates no valid hash. Also, sets l4_rxhash in skb +- * and src/dst port numbers. Sets hash in skb to non-zero hash value +- * on success, zero indicates no valid hash. Also, sets l4_hash in skb - * if hash is a canonical 4-tuple hash over transport ports. - */ -void __skb_get_hash(struct sk_buff *skb) @@ -45,7 +45,7 @@ - return; - - if (keys.ports) -- skb->l4_rxhash = 1; +- skb->l4_hash = 1; - - /* get a consistent hash (same value on both flow directions) */ - if (((__force u32)keys.dst < (__force u32)keys.src) || @@ -61,7 +61,7 @@ - if (!hash) - hash = 1; - -- skb->rxhash = hash; +- skb->hash = hash; -} -EXPORT_SYMBOL(__skb_get_hash); - @@ -173,7 +173,7 @@ - hash = skb->sk->sk_hash; - else - hash = (__force u16) skb->protocol ^ -- skb->rxhash; +- skb->hash; - hash = __flow_hash_1word(hash); - queue_index = map->queues[ - ((u64)hash * map->len) >> 32]; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe backports" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
