The skb_priority, pkt_mark and tunl parameters of dp_netdev_port_input()
are always passed as 0, 0 and NULL respectively. So rather than
passing these values to dp_netdev_port_input() just use them directly.
Signed-off-by: Simon Horman <ho...@verge.net.au>
---
lib/dpif-netdev.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
v2
* Correct change log to refer to dp_netdev_port_input()
instead of dp_netdev_execute_actions()
diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c
index 911cb5d..7cdbb9b 100644
--- a/lib/dpif-netdev.c
+++ b/lib/dpif-netdev.c
@@ -174,8 +174,7 @@ static void dp_netdev_execute_actions(struct dp_netdev *,
const struct flow *,
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 pkt_mark, const struct flow_tnl
*tnl);
+ struct ofpbuf *packet);
static struct dpif_netdev *
dpif_netdev_cast(const struct dpif *dpif)
@@ -1229,8 +1228,7 @@ dp_netdev_flow_used(struct dp_netdev_flow *netdev_flow,
static void
dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port,
- struct ofpbuf *packet, uint32_t skb_priority,
- uint32_t pkt_mark, const struct flow_tnl *tnl)
+ struct ofpbuf *packet)
{
struct dp_netdev_flow *netdev_flow;
struct flow key;
@@ -1240,7 +1238,7 @@ dp_netdev_port_input(struct dp_netdev *dp, struct
dp_netdev_port *port,
return;
}
in_port_.odp_port = port->port_no;
- flow_extract(packet, skb_priority, pkt_mark, tnl, &in_port_, &key);
+ flow_extract(packet, 0, 0, NULL, &in_port_, &key);
netdev_flow = dp_netdev_lookup_flow(dp, &key);
if (netdev_flow) {
dp_netdev_flow_used(netdev_flow, packet);
@@ -1275,7 +1273,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, 0, 0, NULL);
+ dp_netdev_port_input(dp, port, &packet);
} else if (error != EAGAIN && error != EOPNOTSUPP) {
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
--
1.8.4
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
