datapath: Add support for kernel 3.14.

[sliver-openvswitch.git] / datapath / linux / compat / flow_dissector.c

diff --git a/datapath/linux/compat/flow_dissector.c b/datapath/linux/compat/flow_dissector.c
index 7a0d09b..ab60daa 100644 (file)
--- a/datapath/linux/compat/flow_dissector.c
+++ b/datapath/linux/compat/flow_dissector.c
@@ -46,7 +46,7 @@ static void iph_to_flow_copy_addrs(struct flow_keys *flow, const struct iphdr *i
        memcpy(&flow->src, &iph->saddr, sizeof(flow->src) + sizeof(flow->dst));
 }
 
-__be32 skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto)
+static __be32 skb_flow_get_ports(const struct sk_buff *skb, int thoff, u8 ip_proto)
 {
        int poff = proto_ports_offset(ip_proto);
 
@@ -204,7 +204,7 @@ static __always_inline u32 __flow_hash_3words(u32 a, u32 b, u32 c)
        return jhash_3words(a, b, c, hashrnd);
 }
 
-u32 __skb_get_rxhash(struct sk_buff *skb)
+u32 __skb_get_hash(struct sk_buff *skb)
 {
        struct flow_keys keys;
        u32 hash;