Commit 09a8f031 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch 



Jesse Gross says:

====================
Three bug fixes that are fairly small either way but resolve obviously
incorrect code. For net/3.11.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2fdac010 36bf5cc6

net/openvswitch/actions.c

+1 −0
Original line number Diff line number Diff line
@@ -535,6 +535,7 @@ int ovs_execute_actions(struct datapath *dp, struct sk_buff *skb) 
{

	struct sw_flow_actions *acts = rcu_dereference(OVS_CB(skb)->flow->sf_acts);



	OVS_CB(skb)->tun_key = NULL;

	return do_execute_actions(dp, skb, acts->actions,

					 acts->actions_len, false);

}

net/openvswitch/datapath.c

+0 −3
Original line number Diff line number Diff line
@@ -2076,9 +2076,6 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info) 
	ovs_notify(reply, info, &ovs_dp_vport_multicast_group);

	return 0;



	rtnl_unlock();

	return 0;



exit_free:

	kfree_skb(reply);

exit_unlock:

net/openvswitch/flow.c

+1 −1
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ static struct flex_array *alloc_buckets(unsigned int n_buckets) 
	struct flex_array *buckets;

	int i, err;



	buckets = flex_array_alloc(sizeof(struct hlist_head *),

	buckets = flex_array_alloc(sizeof(struct hlist_head),

				   n_buckets, GFP_KERNEL);

	if (!buckets)

		return NULL;