dpif-netdev: Allow different numbers of rx queues for different ports.

[cascardo/ovs.git] / lib / netdev.h

diff --git a/lib/netdev.h b/lib/netdev.h
index 33f301a..8a7f680 100644 (file)
--- a/lib/netdev.h
+++ b/lib/netdev.h
@@ -22,6 +22,7 @@
 #include <stdint.h>
 #include "openvswitch/types.h"
 #include "packets.h"
+#include "flow.h"
 
 #ifdef  __cplusplus
 extern "C" {
@@ -60,7 +61,7 @@ extern "C" {
  *      netdev and access each of those from a different thread.)
  */
 
-struct dpif_packet;
+struct dp_packet;
 struct netdev;
 struct netdev_class;
 struct netdev_rxq;
@@ -117,8 +118,8 @@ struct netdev_tunnel_config {
 
     bool ip_src_flow;
     bool ip_dst_flow;
-    ovs_be32 ip_src;
-    ovs_be32 ip_dst;
+    struct in6_addr ipv6_src;
+    struct in6_addr ipv6_dst;
 
     uint32_t exts;
 
@@ -141,6 +142,7 @@ bool netdev_is_reserved_name(const char *name);
 
 int netdev_n_txq(const struct netdev *netdev);
 int netdev_n_rxq(const struct netdev *netdev);
+int netdev_requested_n_rxq(const struct netdev *netdev);
 bool netdev_is_pmd(const struct netdev *netdev);
 
 /* Open and close. */
@@ -174,26 +176,27 @@ void netdev_rxq_close(struct netdev_rxq *);
 
 const char *netdev_rxq_get_name(const struct netdev_rxq *);
 
-int netdev_rxq_recv(struct netdev_rxq *rx, struct dpif_packet **buffers,
+int netdev_rxq_recv(struct netdev_rxq *rx, struct dp_packet **buffers,
                     int *cnt);
 void netdev_rxq_wait(struct netdev_rxq *);
 int netdev_rxq_drain(struct netdev_rxq *);
 
 /* Packet transmission. */
-int netdev_send(struct netdev *, int qid, struct dpif_packet **, int cnt,
+int netdev_send(struct netdev *, int qid, struct dp_packet **, int cnt,
                 bool may_steal);
 void netdev_send_wait(struct netdev *, int qid);
 
-int netdev_build_header(const struct netdev *, struct ovs_action_push_tnl *data);
+int netdev_build_header(const struct netdev *, struct ovs_action_push_tnl *data,
+                        const struct flow *tnl_flow);
 int netdev_push_header(const struct netdev *netdev,
-                       struct dpif_packet **buffers, int cnt,
+                       struct dp_packet **buffers, int cnt,
                        const struct ovs_action_push_tnl *data);
-int netdev_pop_header(struct netdev *netdev, struct dpif_packet **buffers,
+int netdev_pop_header(struct netdev *netdev, struct dp_packet **buffers,
                       int cnt);
 
 /* Hardware address. */
-int netdev_set_etheraddr(struct netdev *, const uint8_t mac[ETH_ADDR_LEN]);
-int netdev_get_etheraddr(const struct netdev *, uint8_t mac[ETH_ADDR_LEN]);
+int netdev_set_etheraddr(struct netdev *, const struct eth_addr mac);
+int netdev_get_etheraddr(const struct netdev *, struct eth_addr *mac);
 
 /* PHY interface. */
 bool netdev_get_carrier(const struct netdev *);
@@ -258,7 +261,7 @@ int netdev_get_next_hop(const struct netdev *, const struct in_addr *host,
                         struct in_addr *next_hop, char **);
 int netdev_get_status(const struct netdev *, struct smap *);
 int netdev_arp_lookup(const struct netdev *, ovs_be32 ip,
-                      uint8_t mac[ETH_ADDR_LEN]);
+                      struct eth_addr *mac);
 
 struct netdev *netdev_find_dev_by_in4(const struct in_addr *);
 
@@ -336,7 +339,7 @@ typedef void netdev_dump_queue_stats_cb(unsigned int queue_id,
 int netdev_dump_queue_stats(const struct netdev *,
                             netdev_dump_queue_stats_cb *, void *aux);
 
-enum { NETDEV_MAX_RX_BATCH = 256 };     /* Maximum number packets in rx_recv() batch. */
+enum { NETDEV_MAX_BURST = 32 }; /* Maximum number packets in a batch. */
 extern struct seq *tnl_conf_seq;
 
 #ifdef  __cplusplus