diff options
| author | David S. Miller <davem@davemloft.net> | 2012-09-04 15:22:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-04 15:22:28 -0400 |
| commit | cefd81cfeca14ec4c63cc748441634f1d4c0eb3f (patch) | |
| tree | b4541c563d40c4600e79319c2e98919caa19cede /net/openvswitch/flow.h | |
| parent | 3731a334c012ed825a87e1f152bbf980f79dabb2 (diff) | |
| parent | 15eac2a74277bc7de68a7c2a64a7c91b4b6f5961 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch
Diffstat (limited to 'net/openvswitch/flow.h')
| -rw-r--r-- | net/openvswitch/flow.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h index 9b75617ca4e0..d92e22a638cf 100644 --- a/net/openvswitch/flow.h +++ b/net/openvswitch/flow.h @@ -43,7 +43,7 @@ struct sw_flow_actions { struct sw_flow_key { struct { u32 priority; /* Packet QoS priority. */ - u16 in_port; /* Input switch port (or USHRT_MAX). */ + u16 in_port; /* Input switch port (or DP_MAX_PORTS). */ } phy; struct { u8 src[ETH_ALEN]; /* Ethernet source address. */ @@ -161,6 +161,7 @@ int ovs_flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp, int ovs_flow_metadata_from_nlattrs(u32 *priority, u16 *in_port, const struct nlattr *); +#define MAX_ACTIONS_BUFSIZE (16 * 1024) #define TBL_MIN_BUCKETS 1024 struct flow_table { |