Now that most fix function logic (like sFlow) has been moved to
userspace, the vport member of OVS_CB is no longer used by anything,
so drop it.
Signed-off-by: Jesse Gross <je...@nicira.com>
---
datapath/datapath.c | 5 -----
datapath/datapath.h | 2 --
2 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/datapath/datapath.c b/datapath/datapath.c
index 87056cf..3657fe0 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -286,7 +286,6 @@ void dp_process_received_packet(struct vport *p, struct
sk_buff *skb)
int error;
stats = per_cpu_ptr(dp->stats_percpu, smp_processor_id());
- OVS_CB(skb)->vport = p;
if (!OVS_CB(skb)->flow) {
struct sw_flow_key key;
@@ -792,10 +791,6 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb,
struct genl_info *info)
if (!dp)
goto err_unlock;
- if (flow->key.phy.in_port < DP_MAX_PORTS)
- OVS_CB(packet)->vport = get_vport_protected(dp,
- flow->key.phy.in_port);
-
local_bh_disable();
err = execute_actions(dp, packet);
local_bh_enable();
diff --git a/datapath/datapath.h b/datapath/datapath.h
index 4964a51..c2770fe 100644
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -83,7 +83,6 @@ struct datapath {
/**
* struct ovs_skb_cb - OVS data in skb CB
- * @vport: The datapath port on which the skb entered the switch.
* @flow: The flow associated with this packet. May be %NULL if no flow.
* @tun_id: ID of the tunnel that encapsulated this packet. It is 0 if the
* @ip_summed: Consistently stores L4 checksumming status across different
@@ -95,7 +94,6 @@ struct datapath {
* before 2.6.27.
*/
struct ovs_skb_cb {
- struct vport *vport;
struct sw_flow *flow;
__be64 tun_id;
#ifdef NEED_CSUM_NORMALIZE
--
1.7.5.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
