diff options
| author | Simon Horman <horms@verge.net.au> | 2013-06-05 14:28:49 +0900 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2013-06-05 14:28:57 -0700 |
| commit | 6c13071b37b1b4b8115d0b0fbe2058f8f76e016d (patch) | |
| tree | 9fe2ccbc7e6ff004cbdda83baf4e082fb69681ca /lib/dpif-netdev.c | |
| parent | 617e10e71ca1719a8f0070354489858e3cceba32 (diff) | |
odp-execute: Add set skb_mark, set_priority, tunnel support.
The motivation for this is to allow such actions to be honoured
if they are encountered; by the user-space datapath before recirculation;
or by internal processing of actions by ovs-vswitchd before recirculation.
Recirculation will be added by a subsequent patch.
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'lib/dpif-netdev.c')
| -rw-r--r-- | lib/dpif-netdev.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index bd00f184..61031cd7 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -159,6 +159,10 @@ static void dp_netdev_execute_actions(struct dp_netdev *, struct ofpbuf *, struct flow *, const struct nlattr *actions, size_t actions_len); +static void dp_netdev_port_input(struct dp_netdev *dp, + struct dp_netdev_port *port, + struct ofpbuf *packet, uint32_t skb_priority, + uint32_t skb_mark, const struct flow_tnl *tnl); static struct dpif_netdev * dpif_netdev_cast(const struct dpif *dpif) @@ -1032,7 +1036,8 @@ dp_netdev_flow_used(struct dp_netdev_flow *flow, const struct ofpbuf *packet) static void dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port, - struct ofpbuf *packet) + struct ofpbuf *packet, uint32_t skb_priority, + uint32_t skb_mark, const struct flow_tnl *tnl) { struct dp_netdev_flow *flow; struct flow key; @@ -1040,7 +1045,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, NULL, port->port_no, &key); + flow_extract(packet, skb_priority, skb_mark, tnl, port->port_no, &key); flow = dp_netdev_lookup_flow(dp, &key); if (flow) { dp_netdev_flow_used(flow, packet); @@ -1071,7 +1076,7 @@ dpif_netdev_run(struct dpif *dpif) error = port->rx ? netdev_rx_recv(port->rx, &packet) : EOPNOTSUPP; if (!error) { - dp_netdev_port_input(dp, port, &packet); + dp_netdev_port_input(dp, port, &packet, 0, 0, NULL); } else if (error != EAGAIN && error != EOPNOTSUPP) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); VLOG_ERR_RL(&rl, "error receiving data from %s: %s", |