mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00
Code Issues Releases Wiki Activity

datapath: Kill VPORT_F_TUN_ID vport flag.

Browse Source 
VPORT_F_TUN_ID is last remaining flag, once we remove it, flags
field from vport-ops can be removed.  Since it does not complicate
much code, we decided to remove this flag.

Signed-off-by: Pravin B Shelar <pshelar@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
This commit is contained in:
Pravin B Shelar
2013-05-06 10:34:19 -07:00
parent 806b46ef3d
commit db0c31340f
9 changed files with 15 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
datapath/vport-lisp.c
View File

@@ -219,7 +219,6 @@ static int lisp_rcv(struct sock *sk, struct sk_buff *skb)
/* Save outer tunnel values */
iph = ip_hdr(skb);
tnl_tun_key_init(&tun_key, iph, key, OVS_TNL_F_KEY);
OVS_CB(skb)->tun_key = &tun_key;
/* Drop non-IP inner packets */
inner_iph = (struct iphdr *)(lisph + 1);
@@ -241,7 +240,7 @@ static int lisp_rcv(struct sock *sk, struct sk_buff *skb)
ethh->h_source[0] = 0x02;
ethh->h_proto = protocol;
ovs_tnl_rcv(vport_from_priv(lisp_port), skb);
ovs_tnl_rcv(vport_from_priv(lisp_port), skb, &tun_key);
goto out;
error:
@@ -390,7 +389,6 @@ static const char *lisp_get_name(const struct vport *vport)
const struct vport_ops ovs_lisp_vport_ops = {
.type = OVS_VPORT_TYPE_LISP,
.flags = VPORT_F_TUN_ID,
.create = lisp_tnl_create,
.destroy = lisp_tnl_destroy,
.get_name = lisp_get_name,