From: Pravin B Shelar <pshelar@nicira.com>
Date: Fri, 6 Sep 2013 18:16:15 +0000 (-0700)
Subject: datapath lisp: use iptunnel_pull_header().
X-Git-Tag: sliver-openvswitch-2.0.90-1~15^2~17
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=971fd4ab4df3fff2225fc0a547b3a1baee879c8a;p=sliver-openvswitch.git
datapath lisp: use iptunnel_pull_header().
CC: Lori Jakab <lojakab@cisco.com>
Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Lorand Jakab <lojakab@cisco.com>
Acked-by: Jesse Gross <jesse@nicira.com>
---
diff --git a/datapath/vport-lisp.c b/datapath/vport-lisp.c
index 259cc2b29..2cec115b7 100644
--- a/datapath/vport-lisp.c
+++ b/datapath/vport-lisp.c
@@ -205,42 +205,6 @@ static void lisp_build_header(const struct vport *vport,
lisph->u2.word2.locator_status_bits = 1;
}
-/**
- * ovs_tnl_rcv - ingress point for generic tunnel code
- *
- * @vport: port this packet was received on
- * @skb: received packet
- * @tun_key: tunnel that carried packet
- *
- * Must be called with rcu_read_lock.
- *
- * Packets received by this function are in the following state:
- * - skb->data points to the inner Ethernet header.
- * - The inner Ethernet header is in the linear data area.
- * - The layer pointers are undefined.
- */
-static void ovs_tnl_rcv(struct vport *vport, struct sk_buff *skb,
- struct ovs_key_ipv4_tunnel *tun_key)
-{
- struct ethhdr *eh;
-
- skb_reset_mac_header(skb);
- eh = eth_hdr(skb);
-
- if (likely(ntohs(eh->h_proto) >= ETH_P_802_3_MIN))
- skb->protocol = eh->h_proto;
- else
- skb->protocol = htons(ETH_P_802_2);
-
- skb_dst_drop(skb);
- nf_reset(skb);
- skb_clear_rxhash(skb);
- secpath_reset(skb);
- vlan_set_tci(skb, 0);
-
- ovs_vport_receive(vport, skb, tun_key);
-}
-
/* Called with rcu_read_lock and BH disabled. */
static int lisp_rcv(struct sock *sk, struct sk_buff *skb)
{
@@ -256,13 +220,11 @@ static int lisp_rcv(struct sock *sk, struct sk_buff *skb)
if (unlikely(!lisp_port))
goto error;
- if (unlikely(!pskb_may_pull(skb, LISP_HLEN)))
+ if (iptunnel_pull_header(skb, LISP_HLEN, 0))
goto error;
lisph = lisp_hdr(skb);
- skb_pull_rcsum(skb, LISP_HLEN);
-
if (lisph->instance_id_present != 1)
key = 0;
else
@@ -284,6 +246,7 @@ static int lisp_rcv(struct sock *sk, struct sk_buff *skb)
default:
goto error;
}
+ skb->protocol = protocol;
/* Add Ethernet header */
ethh = (struct ethhdr *)skb_push(skb, ETH_HLEN);
@@ -294,7 +257,7 @@ static int lisp_rcv(struct sock *sk, struct sk_buff *skb)
ovs_skb_postpush_rcsum(skb, skb->data, ETH_HLEN);
- ovs_tnl_rcv(vport_from_priv(lisp_port), skb, &tun_key);
+ ovs_vport_receive(vport_from_priv(lisp_port), skb, &tun_key);
goto out;
error: