Commit 2573d788 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ovs-vport-cleanup' 



Pravin B Shelar says:

====================
openvswitch: Cleanup post vport conversion.

After converting all vport to netdev implmentations there
is no need for some of vport functionality.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 8e816df8 a581b96d

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 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include "conntrack.h"

#include "flow.h"

#include "flow_table.h"

#include "vport.h"



#define DP_MAX_PORTS           USHRT_MAX

#define DP_VPORT_HASH_BUCKETS  1024
@@ -94,15 +93,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;

};
@@ -137,7 +133,6 @@ struct dp_upcall_info { 
struct ovs_net {

	struct list_head dps;

	struct work_struct dp_notify_work;

	struct vport_net vport_net;



	/* Module reference for configuring conntrack. */

	bool xt_label;

net/openvswitch/flow.c

+2 −1
Original line number Diff line number Diff line
@@ -46,10 +46,11 @@ 
#include <net/mpls.h>

#include <net/ndisc.h>



#include "conntrack.h"

#include "datapath.h"

#include "flow.h"

#include "flow_netlink.h"

#include "conntrack.h"

#include "vport.h"



u64 ovs_flow_used_time(unsigned long flow_jiffies)

{

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)