diff options
| author | Jesse Gross <jesse@nicira.com> | 2012-09-13 20:11:08 -0700 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2012-10-03 10:04:10 -0700 |
| commit | 296e07ace0ff2d5819ce760d6018ba82d14aa2a8 (patch) | |
| tree | e5f8105b65c29bba8c70255c97c84c2a5c716261 /lib/dpif-netdev.c | |
| parent | f0b8759908a74f018f6bd75fdc1b7f1ff8776f5f (diff) | |
flow: Extend struct flow to contain tunnel outer header.
Soon the kernel will begin supplying the information about the outer
IP header for tunneled packets and userspace will need to be able to
track it as part of the flow. For the time being this is only used
internally by OVS and not exposed outwards to OpenFlow. As a result,
this threads the information throughout userspace but simply stores
the existing tun_id in it.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'lib/dpif-netdev.c')
| -rw-r--r-- | lib/dpif-netdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index dc4479e5..c9e3210f 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -916,7 +916,7 @@ dpif_netdev_execute(struct dpif *dpif, const struct dpif_execute *execute) ofpbuf_reserve(©, DP_NETDEV_HEADROOM); ofpbuf_put(©, execute->packet->data, execute->packet->size); - flow_extract(©, 0, 0, -1, &key); + flow_extract(©, 0, NULL, -1, &key); error = dpif_netdev_flow_from_nlattrs(execute->key, execute->key_len, &key); if (!error) { @@ -1014,7 +1014,7 @@ dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port, if (packet->size < ETH_HEADER_LEN) { return; } - flow_extract(packet, 0, 0, odp_port_to_ofp_port(port->port_no), &key); + flow_extract(packet, 0, NULL, odp_port_to_ofp_port(port->port_no), &key); flow = dp_netdev_lookup_flow(dp, &key); if (flow) { dp_netdev_flow_used(flow, packet); |