Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3eedb41f authored by Pravin B Shelar's avatar Pravin B Shelar Committed by David S. Miller
Browse files

openvswitch: Remove egress_tun_info. 



tun info is passed using skb-dst pointer. Now we have
converted all vports to netdev based implementation so
Now we can remove redundant pointer to tun-info from OVS_CB.

Signed-off-by: default avatarPravin B Shelar <pshelar@nicira.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 24d43f32

net/openvswitch/actions.c

+0 −5
Original line number Diff line number Diff line
@@ -896,10 +896,6 @@ static int execute_set_action(struct sk_buff *skb, 
		skb_dst_drop(skb);

		dst_hold((struct dst_entry *)tun->tun_dst);

		skb_dst_set(skb, (struct dst_entry *)tun->tun_dst);



		/* FIXME: Remove when all vports have been converted */

		OVS_CB(skb)->egress_tun_info = &tun->tun_dst->u.tun_info;



		return 0;

	}
@@ -1159,7 +1155,6 @@ int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb, 
	int err;



	this_cpu_inc(exec_actions_level);

	OVS_CB(skb)->egress_tun_info = NULL;

	err = do_execute_actions(dp, skb, key,

				 acts->actions, acts->actions_len);

net/openvswitch/datapath.c

+0 −1
Original line number Diff line number Diff line
@@ -610,7 +610,6 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info) 
		goto err_flow_free;



	rcu_assign_pointer(flow->sf_acts, acts);

	OVS_CB(packet)->egress_tun_info = NULL;

	packet->priority = flow->key.phy.priority;

	packet->mark = flow->key.phy.skb_mark;

net/openvswitch/datapath.h

+0 −3
Original line number Diff line number Diff line
@@ -94,15 +94,12 @@ struct datapath { 


/**

 * struct ovs_skb_cb - OVS data in skb CB

 * @egress_tun_key: Tunnel information about this packet on egress path.

 * NULL if the packet is not being tunneled.

 * @input_vport: The original vport packet came in on. This value is cached

 * when a packet is received by OVS.

 * @mru: The maximum received fragement size; 0 if the packet is not

 * fragmented.

 */

struct ovs_skb_cb {

	struct ip_tunnel_info  *egress_tun_info;

	struct vport		*input_vport;

	u16			mru;

};

net/openvswitch/vport-geneve.c

+1 −2
Original line number Diff line number Diff line
@@ -62,8 +62,7 @@ static int geneve_get_egress_tun_info(struct vport *vport, struct sk_buff *skb, 


	return ovs_tunnel_get_egress_info(egress_tun_info,

					  ovs_dp_get_net(vport->dp),

					  OVS_CB(skb)->egress_tun_info,

					  IPPROTO_UDP, skb->mark, sport, dport);

					  skb, IPPROTO_UDP, sport, dport);

}



static struct vport *geneve_tnl_create(const struct vport_parms *parms)

net/openvswitch/vport-gre.c

+1 −2
Original line number Diff line number Diff line
@@ -89,8 +89,7 @@ static int gre_get_egress_tun_info(struct vport *vport, struct sk_buff *skb, 
{

	return ovs_tunnel_get_egress_info(egress_tun_info,

					  ovs_dp_get_net(vport->dp),

					  OVS_CB(skb)->egress_tun_info,

					  IPPROTO_GRE, skb->mark, 0, 0);

					  skb, IPPROTO_GRE, 0, 0);

}



static struct vport_ops ovs_gre_vport_ops = {