configure: Fix typo in user message.

[sliver-openvswitch.git] / datapath / flow.h

diff --git a/datapath/flow.h b/datapath/flow.h
index 1d75a01..6a3c539 100644 (file)
--- a/datapath/flow.h
+++ b/datapath/flow.h
@@ -40,8 +40,8 @@ struct sw_flow_key {
                __be16 type;            /* Ethernet frame type. */
        } eth;
        struct {
-               u8     nw_proto;        /* IP protocol or lower 8 bits of ARP opcode. */
-               u8     nw_tos;          /* IP ToS (DSCP field, 6 bits). */
+               u8     proto;           /* IP protocol or lower 8 bits of ARP opcode. */
+               u8     tos;             /* IP ToS (DSCP field, 6 bits). */
        } ip;
        union {
                struct {
@@ -152,6 +152,8 @@ int flow_cmp(const struct tbl_node *, void *target, int len);
 int flow_to_nlattrs(const struct sw_flow_key *, struct sk_buff *);
 int flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp,
                      const struct nlattr *);
+int flow_metadata_from_nlattrs(u16 *in_port, __be64 *tun_id,
+                              const struct nlattr *);
 
 static inline struct sw_flow *flow_cast(const struct tbl_node *node)
 {