diff options
Diffstat (limited to 'net/openvswitch/datapath.c')
-rw-r--r-- | net/openvswitch/datapath.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index a64d3eb1f9a9..356677c3a0c2 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c | |||
@@ -463,7 +463,8 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, | |||
463 | nla_data(upcall_info->userdata)); | 463 | nla_data(upcall_info->userdata)); |
464 | 464 | ||
465 | if (upcall_info->egress_tun_info) { | 465 | if (upcall_info->egress_tun_info) { |
466 | nla = nla_nest_start(user_skb, OVS_PACKET_ATTR_EGRESS_TUN_KEY); | 466 | nla = nla_nest_start_noflag(user_skb, |
467 | OVS_PACKET_ATTR_EGRESS_TUN_KEY); | ||
467 | if (!nla) { | 468 | if (!nla) { |
468 | err = -EMSGSIZE; | 469 | err = -EMSGSIZE; |
469 | goto out; | 470 | goto out; |
@@ -475,7 +476,7 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, | |||
475 | } | 476 | } |
476 | 477 | ||
477 | if (upcall_info->actions_len) { | 478 | if (upcall_info->actions_len) { |
478 | nla = nla_nest_start(user_skb, OVS_PACKET_ATTR_ACTIONS); | 479 | nla = nla_nest_start_noflag(user_skb, OVS_PACKET_ATTR_ACTIONS); |
479 | if (!nla) { | 480 | if (!nla) { |
480 | err = -EMSGSIZE; | 481 | err = -EMSGSIZE; |
481 | goto out; | 482 | goto out; |
@@ -776,7 +777,7 @@ static int ovs_flow_cmd_fill_actions(const struct sw_flow *flow, | |||
776 | * This can only fail for dump operations because the skb is always | 777 | * This can only fail for dump operations because the skb is always |
777 | * properly sized for single flows. | 778 | * properly sized for single flows. |
778 | */ | 779 | */ |
779 | start = nla_nest_start(skb, OVS_FLOW_ATTR_ACTIONS); | 780 | start = nla_nest_start_noflag(skb, OVS_FLOW_ATTR_ACTIONS); |
780 | if (start) { | 781 | if (start) { |
781 | const struct sw_flow_actions *sf_acts; | 782 | const struct sw_flow_actions *sf_acts; |
782 | 783 | ||