Merge remote-tracking branch 'wireless/master' into mac80211

1 files changed, 3 insertions, 2 deletions

diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c
index a225089df5b6..466820b6e344 100644
--- a/net/core/flow_dissector.c
+++ b/net/core/flow_dissector.c
@@ -4,6 +4,7 @@
 #include <linux/ipv6.h>
 #include <linux/if_vlan.h>
 #include <net/ip.h>
+#include <net/ipv6.h>
 #include <linux/if_tunnel.h>
 #include <linux/if_pppox.h>
 #include <linux/ppp_defs.h>
@@ -55,8 +56,8 @@ ipv6:
                         return false;
 
                 ip_proto = iph->nexthdr;
-                flow->src = iph->saddr.s6_addr32[3];
-                flow->dst = iph->daddr.s6_addr32[3];
+                flow->src = (__force __be32)ipv6_addr_hash(&iph->saddr);
+                flow->dst = (__force __be32)ipv6_addr_hash(&iph->daddr);
                 nhoff += sizeof(struct ipv6hdr);
                 break;
         }