X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fflow.h;h=3f3624ffd00a059dcb051a602206a5cf218bc940;hb=72e8bf28bb38e8816435c64859fb350215b6a9e6;hp=54f0fcdc0f4d4a6d5a461e170fe511988a8b6ae2;hpb=24f974c481bc5230552b23d96312f645f7533cd3;p=sliver-openvswitch.git diff --git a/datapath/flow.h b/datapath/flow.h index 54f0fcdc0..3f3624ffd 100644 --- a/datapath/flow.h +++ b/datapath/flow.h @@ -44,6 +44,7 @@ struct sw_flow_key { struct ovs_key_ipv4_tunnel tun_key; /* Encapsulating tunnel key. */ struct { u32 priority; /* Packet QoS priority. */ + u32 skb_mark; /* SKB mark. */ u16 in_port; /* Input switch port (or DP_MAX_PORTS). */ } phy; struct { @@ -147,6 +148,7 @@ u64 ovs_flow_used_time(unsigned long flow_jiffies); * OVS_KEY_ATTR_TUN_ID 8 -- 4 12 * OVS_KEY_ATTR_IPV4_TUNNEL 24 -- 4 28 * OVS_KEY_ATTR_IN_PORT 4 -- 4 8 + * OVS_KEY_ATTR_SKB_MARK 4 -- 4 8 * OVS_KEY_ATTR_ETHERNET 12 -- 4 16 * OVS_KEY_ATTR_ETHERTYPE 2 2 4 8 (outer VLAN ethertype) * OVS_KEY_ATTR_8021Q 4 -- 4 8 @@ -156,9 +158,9 @@ u64 ovs_flow_used_time(unsigned long flow_jiffies); * OVS_KEY_ATTR_ICMPV6 2 2 4 8 * OVS_KEY_ATTR_ND 28 -- 4 32 * ------------------------------------------------- - * total 184 + * total 192 */ -#define FLOW_BUFSIZE 184 +#define FLOW_BUFSIZE 192 int ovs_flow_to_nlattrs(const struct sw_flow_key *, struct sk_buff *); int ovs_flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp,