Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 369747
b: refs/heads/master
c: 3a4e0d6
h: refs/heads/master
i:
  369745: 6145a8d
  369743: 4e8320e
v: v3
  • Loading branch information
Pravin B Shelar authored and David S. Miller committed Apr 25, 2013
1 parent b6443ea commit 4557b36
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: def3117493eafd9dfa1f809d861e0031b2cc8a07
refs/heads/master: 3a4e0d6a95b2b6f7b22eb7c7361a0fc4289478eb
12 changes: 8 additions & 4 deletions trunk/net/openvswitch/datapath.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand Down

0 comments on commit 4557b36

Please sign in to comment.