From fd68079ac5e5f1604ac3b5c07355848fdcb22c5e Mon Sep 17 00:00:00 2001 From: Ansis Atteka Date: Thu, 3 May 2012 18:40:38 -0700 Subject: [PATCH] --- yaml --- r: 300195 b: refs/heads/master c: 4cb6e116bb97c8b87a1f4f95e99d0c8dda2a6e9b h: refs/heads/master i: 300193: 7d5c2c3840cf9ae0fdc329f8e365b3fd2ea129f7 300191: 8bbc878337a369edd1a45e98cbeb940dead6b214 v: v3 --- [refs] | 2 +- trunk/net/openvswitch/datapath.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3f98a5168251..3276acb801eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf32fecdc1851ad9ca960f56771b798d17c26cf1 +refs/heads/master: 4cb6e116bb97c8b87a1f4f95e99d0c8dda2a6e9b diff --git a/trunk/net/openvswitch/datapath.c b/trunk/net/openvswitch/datapath.c index e44e631ea952..4cb615d46363 100644 --- a/trunk/net/openvswitch/datapath.c +++ b/trunk/net/openvswitch/datapath.c @@ -1641,10 +1641,9 @@ static int ovs_vport_cmd_set(struct sk_buff *skb, struct genl_info *info) reply = ovs_vport_cmd_build_info(vport, info->snd_pid, info->snd_seq, OVS_VPORT_CMD_NEW); if (IS_ERR(reply)) { - err = PTR_ERR(reply); netlink_set_err(init_net.genl_sock, 0, - ovs_dp_vport_multicast_group.id, err); - return 0; + ovs_dp_vport_multicast_group.id, PTR_ERR(reply)); + goto exit_unlock; } genl_notify(reply, genl_info_net(info), info->snd_pid,