datapath: Don't dump partial action lists in flows.

[sliver-openvswitch.git] / datapath / datapath.c

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 054a1ac..0f4796e 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -309,8 +309,6 @@ static int queue_gso_packets(struct net *net, int dp_ifindex,
        segs = skb_gso_segment(skb, NETIF_F_SG | NETIF_F_HW_CSUM);
        if (IS_ERR(segs))
                return PTR_ERR(segs);
-       if (!segs)
-               return queue_userspace_packet(net, dp_ifindex, skb, upcall_info);
 
        /* Queue all of the segments. */
        skb = segs;
@@ -1113,9 +1111,14 @@ static int ovs_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp,
        start = nla_nest_start(skb, OVS_FLOW_ATTR_ACTIONS);
        if (start) {
                err = actions_to_attr(sf_acts->actions, sf_acts->actions_len, skb);
-               if (err < 0 && skb_orig_len)
-                       goto error;
-               nla_nest_end(skb, start);
+               if (!err)
+                       nla_nest_end(skb, start);
+               else {
+                       if (skb_orig_len)
+                               goto error;
+
+                       nla_nest_cancel(skb, start);
+               }
        } else if (skb_orig_len) {
                err = -ENOMEM;
                goto error;