From cc4015df5f24df80ad8ebf0ed965782b44964b4e Mon Sep 17 00:00:00 2001 From: Jesse Gross <jesse@nicira.com> Date: Mon, 1 Aug 2011 00:35:20 -0700 Subject: [PATCH] datapath: Set vport in skb when executed from userspace. Currently, the OVS_CB(skb)->vport member is never initialized for packets coming from userspace. This means that they can never be sampled by sFlow and generally violates our principle that userspace packets should be made to look the same as others. Signed-off-by: Jesse Gross <jesse@nicira.com> Acked-by: Pravin Shelar <pshelar@nicira.com> --- datapath/datapath.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/datapath/datapath.c b/datapath/datapath.c index 79df5f898..232b26504 100644 --- a/datapath/datapath.c +++ b/datapath/datapath.c @@ -687,6 +687,11 @@ static int ovs_packet_cmd_execute(struct sk_buff *skb, struct genl_info *info) err = -ENODEV; if (!dp) goto err_unlock; + + if (flow->key.eth.in_port < DP_MAX_PORTS) + OVS_CB(packet)->vport = get_vport_protected(dp, + flow->key.eth.in_port); + err = execute_actions(dp, packet); rcu_read_unlock(); -- 2.47.0