datapath: Correctly report flow used times for first 5 minutes after boot.

[sliver-openvswitch.git] / datapath / vport-lisp.c

diff --git a/datapath/vport-lisp.c b/datapath/vport-lisp.c
index b1581ef..c2698ae 100644 (file)
--- a/datapath/vport-lisp.c
+++ b/datapath/vport-lisp.c
@@ -165,12 +165,17 @@ static __be64 instance_id_to_tunnel_id(__u8 *iid)
  */
 static u16 get_src_port(struct sk_buff *skb)
 {
-       int low;
-       int high;
+       u32 hash = skb_get_rxhash(skb);
        unsigned int range;
-       struct sw_flow_key *pkt_key = OVS_CB(skb)->pkt_key;
-       u32 hash = jhash2((const u32 *)pkt_key,
-                         sizeof(*pkt_key) / sizeof(u32), 0);
+       int high;
+       int low;
+
+       if (!hash) {
+               struct sw_flow_key *pkt_key = OVS_CB(skb)->pkt_key;
+
+               hash = jhash2((const u32 *)pkt_key,
+                           sizeof(*pkt_key) / sizeof(u32), 0);
+       }
 
        inet_get_local_port_range(&low, &high);
        range = (high - low) + 1;
@@ -393,7 +398,6 @@ static void handle_offloads(struct sk_buff *skb)
 
 static int lisp_send(struct vport *vport, struct sk_buff *skb)
 {
-       struct net *net = ovs_dp_get_net(vport->dp);
        int network_offset = skb_network_offset(skb);
        struct rtable *rt;
        int min_headroom;
@@ -438,8 +442,11 @@ static int lisp_send(struct vport *vport, struct sk_buff *skb)
                        goto err_free_rt;
        }
 
+       /* Reset l2 headers. */
        skb_pull(skb, network_offset);
        skb_reset_mac_header(skb);
+       vlan_set_tci(skb, 0);
+
        skb_reset_inner_headers(skb);
 
        __skb_push(skb, LISP_HLEN);
@@ -453,7 +460,7 @@ static int lisp_send(struct vport *vport, struct sk_buff *skb)
 
        df = OVS_CB(skb)->tun_key->tun_flags &
                                  TUNNEL_DONT_FRAGMENT ?  htons(IP_DF) : 0;
-       sent_len = iptunnel_xmit(net, rt, skb,
+       sent_len = iptunnel_xmit(rt, skb,
                             saddr, OVS_CB(skb)->tun_key->ipv4_dst,
                             IPPROTO_UDP, OVS_CB(skb)->tun_key->ipv4_tos,
                             OVS_CB(skb)->tun_key->ipv4_ttl, df);