projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openflow-1.0: Rename ofp_match to ofp10_match, OFPFW_* to OFPFW10_*.
[openvswitch]
/
datapath
/
flow.h
diff --git
a/datapath/flow.h
b/datapath/flow.h
index 61310d06f2f51e5ddf4fcb6cec2c472a58ea90f2..5be481e6b2635a796065d51085b6d19294a7fd99 100644
(file)
--- a/
datapath/flow.h
+++ b/
datapath/flow.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2007-2011 Nicira
Networks
.
+ * Copyright (c) 2007-2011 Nicira
, Inc
.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
@@
-44,7
+44,7
@@
struct sw_flow_key {
struct {
__be64 tun_id; /* Encapsulating tunnel ID. */
u32 priority; /* Packet QoS priority. */
struct {
__be64 tun_id; /* Encapsulating tunnel ID. */
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. */
} phy;
struct {
u8 src[ETH_ALEN]; /* Ethernet source address. */
@@
-168,6
+168,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, __be64 *tun_id,
const struct nlattr *);
int ovs_flow_metadata_from_nlattrs(u32 *priority, u16 *in_port, __be64 *tun_id,
const struct nlattr *);
+#define MAX_ACTIONS_BUFSIZE (16 * 1024)
#define TBL_MIN_BUCKETS 1024
struct flow_table {
#define TBL_MIN_BUCKETS 1024
struct flow_table {