From: Simon Horman Date: Wed, 22 May 2013 07:08:06 +0000 (+0900) Subject: dpif-netdev: Move decoding of data out of dp_netdev_output_userspace() X-Git-Tag: sliver-openvswitch-1.10.90-3~6^2~216 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;ds=sidebyside;h=12b3586d5743fec767367a9cbc9e04bebda170c4;p=sliver-openvswitch.git dpif-netdev: Move decoding of data out of dp_netdev_output_userspace() This is in preparation for making dp_netdev_action_userspace() more generic and passing dp_netdev_output_userspace() as a callback. In this case it makes sense to decode userdata in generic code. Signed-off-by: Simon Horman Signed-off-by: Ben Pfaff --- diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 86207e99c..a4ac23f16 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -1199,11 +1199,8 @@ dp_netdev_sample(struct dp_netdev *dp, static void dp_netdev_action_userspace(struct dp_netdev *dp, struct ofpbuf *packet, const struct flow *key, - const struct nlattr *a) + const struct nlattr *userdata) { - const struct nlattr *userdata; - - userdata = nl_attr_find_nested(a, OVS_USERSPACE_ATTR_USERDATA); dp_netdev_output_userspace(dp, packet, DPIF_UC_ACTION, key, userdata); } @@ -1287,9 +1284,13 @@ dp_netdev_execute_actions(struct dp_netdev *dp, dp_netdev_output_port(dp, packet, nl_attr_get_u32(a)); break; - case OVS_ACTION_ATTR_USERSPACE: - dp_netdev_action_userspace(dp, packet, key, a); + case OVS_ACTION_ATTR_USERSPACE: { + const struct nlattr *userdata; + + userdata = nl_attr_find_nested(a, OVS_USERSPACE_ATTR_USERDATA); + dp_netdev_action_userspace(dp, packet, key, userdata); break; + } case OVS_ACTION_ATTR_PUSH_VLAN: { const struct ovs_action_push_vlan *vlan = nl_attr_get(a);