From 4557b36681e0a54d446a11d9445e8eec8c186f65 Mon Sep 17 00:00:00 2001
From: Pravin B Shelar <pshelar@nicira.com>
Date: Tue, 23 Apr 2013 07:48:48 +0000
Subject: [PATCH] --- yaml --- r: 369747 b: refs/heads/master c:
 3a4e0d6a95b2b6f7b22eb7c7361a0fc4289478eb h: refs/heads/master i:   369745:
 6145a8ddea49f53c6aecb37f5896735bfad7c2ad   369743:
 4e8320e6b3a5b7f4cd0beb336bebd8b0a91e8fdd v: v3

---
 [refs]                           |  2 +-
 trunk/net/openvswitch/datapath.c | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index fc4e6e2923ce..606d20a99ba5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: def3117493eafd9dfa1f809d861e0031b2cc8a07
+refs/heads/master: 3a4e0d6a95b2b6f7b22eb7c7361a0fc4289478eb
diff --git a/trunk/net/openvswitch/datapath.c b/trunk/net/openvswitch/datapath.c
index d2f9f2e57298..74a5fe6feae3 100644
--- a/trunk/net/openvswitch/datapath.c
+++ b/trunk/net/openvswitch/datapath.c
@@ -270,7 +270,8 @@ static struct genl_family dp_packet_genl_family = {
 	.name = OVS_PACKET_FAMILY,
 	.version = OVS_PACKET_VERSION,
 	.maxattr = OVS_PACKET_ATTR_MAX,
-	.netnsok = true
+	.netnsok = true,
+	.parallel_ops = true,
 };
 
 int ovs_dp_upcall(struct datapath *dp, struct sk_buff *skb,
@@ -836,7 +837,8 @@ static struct genl_family dp_flow_genl_family = {
 	.name = OVS_FLOW_FAMILY,
 	.version = OVS_FLOW_VERSION,
 	.maxattr = OVS_FLOW_ATTR_MAX,
-	.netnsok = true
+	.netnsok = true,
+	.parallel_ops = true,
 };
 
 static struct genl_multicast_group ovs_dp_flow_multicast_group = {
@@ -1269,7 +1271,8 @@ static struct genl_family dp_datapath_genl_family = {
 	.name = OVS_DATAPATH_FAMILY,
 	.version = OVS_DATAPATH_VERSION,
 	.maxattr = OVS_DP_ATTR_MAX,
-	.netnsok = true
+	.netnsok = true,
+	.parallel_ops = true,
 };
 
 static struct genl_multicast_group ovs_dp_datapath_multicast_group = {
@@ -1623,7 +1626,8 @@ static struct genl_family dp_vport_genl_family = {
 	.name = OVS_VPORT_FAMILY,
 	.version = OVS_VPORT_VERSION,
 	.maxattr = OVS_VPORT_ATTR_MAX,
-	.netnsok = true
+	.netnsok = true,
+	.parallel_ops = true,
 };
 
 struct genl_multicast_group ovs_dp_vport_multicast_group = {