leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Jesse Gross says:

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

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2013-08-15 01:41:10 -07:00
commit 09a8f03197
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/openvswitch/actions.c
View File

@ -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); 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, return do_execute_actions(dp, skb, acts->actions,
acts->actions_len, false); acts->actions_len, false);
} }

3
net/openvswitch/datapath.c
View File

@ -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); ovs_notify(reply, info, &ovs_dp_vport_multicast_group);
return 0; return 0;
rtnl_unlock();
return 0;
exit_free: exit_free:
kfree_skb(reply); kfree_skb(reply);
exit_unlock: exit_unlock:

2
net/openvswitch/flow.c
View File

@ -240,7 +240,7 @@ static struct flex_array *alloc_buckets(unsigned int n_buckets)
struct flex_array *buckets; struct flex_array *buckets;
int i, err; int i, err;
buckets = flex_array_alloc(sizeof(struct hlist_head *), buckets = flex_array_alloc(sizeof(struct hlist_head),
n_buckets, GFP_KERNEL); n_buckets, GFP_KERNEL);
if (!buckets) if (!buckets)
return NULL; return NULL;