Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d963352 authored by Thomas Graf's avatar Thomas Graf Committed by Jesse Gross
Browse files

openvswitch: Don't insert empty OVS_VPORT_ATTR_OPTIONS attribute 



The port specific options are currently unused resulting in an
empty OVS_VPORT_ATTR_OPTIONS nested attribute being inserted
into every OVS_VPORT_CMD_GET message.

Don't insert OVS_VPORT_ATTR_OPTIONS if no options are present.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarJesse Gross <jesse@nicira.com>
parent 22e3880a

net/openvswitch/vport.c

+8 −6
Original line number Diff line number Diff line
@@ -301,18 +301,20 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats) 
int ovs_vport_get_options(const struct vport *vport, struct sk_buff *skb)

{

	struct nlattr *nla;

	int err;



	if (!vport->ops->get_options)

		return 0;



	nla = nla_nest_start(skb, OVS_VPORT_ATTR_OPTIONS);

	if (!nla)

		return -EMSGSIZE;



	if (vport->ops->get_options) {

		int err = vport->ops->get_options(vport, skb);

	err = vport->ops->get_options(vport, skb);

	if (err) {

		nla_nest_cancel(skb, nla);

		return err;

	}

	}



	nla_nest_end(skb, nla);

	return 0;