Merge 'master' into 'next'.

[sliver-openvswitch.git] / ofproto / ofproto.h

diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h
index 4c54873..ea9f98b 100644 (file)
--- a/ofproto/ofproto.h
+++ b/ofproto/ofproto.h
@@ -33,7 +33,6 @@ extern "C" {
 
 struct cfm;
 struct cls_rule;
-struct dpif_port;
 struct netdev;
 struct ofproto;
 struct shash;
@@ -93,11 +92,17 @@ struct ofproto_controller {
 #define DEFAULT_SERIAL_DESC "None"
 #define DEFAULT_DP_DESC "None"
 
+void ofproto_enumerate_types(struct sset *types);
+const char *ofproto_normalize_type(const char *);
+
+int ofproto_enumerate_names(const char *type, struct sset *names);
 void ofproto_parse_name(const char *name, char **dp_name, char **dp_type);
 
 int ofproto_create(const char *datapath, const char *datapath_type,
                    struct ofproto **ofprotop);
 void ofproto_destroy(struct ofproto *);
+int ofproto_delete(const char *name, const char *type);
+
 int ofproto_run(struct ofproto *);
 void ofproto_wait(struct ofproto *);
 bool ofproto_is_alive(const struct ofproto *);
@@ -123,7 +128,7 @@ void ofproto_port_dump_start(struct ofproto_port_dump *,
 bool ofproto_port_dump_next(struct ofproto_port_dump *, struct ofproto_port *);
 int ofproto_port_dump_done(struct ofproto_port_dump *);
 
-/* Iterates through each DPIF_PORT in OFPROTO, using DUMP as state.
+/* Iterates through each OFPROTO_PORT in OFPROTO, using DUMP as state.
  *
  * Arguments all have pointer type.
  *
@@ -158,38 +163,39 @@ void ofproto_set_desc(struct ofproto *,
 int ofproto_set_snoops(struct ofproto *, const struct sset *snoops);
 int ofproto_set_netflow(struct ofproto *,
                         const struct netflow_options *nf_options);
-void ofproto_set_sflow(struct ofproto *, const struct ofproto_sflow_options *);
+int ofproto_set_sflow(struct ofproto *, const struct ofproto_sflow_options *);
 
 /* Configuration of ports. */
 
-void ofproto_port_unregister(struct ofproto *, uint32_t port_no);
+void ofproto_port_unregister(struct ofproto *, uint16_t ofp_port);
 
-void ofproto_port_clear_cfm(struct ofproto *, uint32_t port_no);
-void ofproto_port_set_cfm(struct ofproto *, uint32_t port_no,
+void ofproto_port_clear_cfm(struct ofproto *, uint16_t ofp_port);
+void ofproto_port_set_cfm(struct ofproto *, uint16_t ofp_port,
                           const struct cfm *,
                           const uint16_t *remote_mps, size_t n_remote_mps);
-const struct cfm *ofproto_port_get_cfm(struct ofproto *, uint32_t port_no);
+const struct cfm *ofproto_port_get_cfm(struct ofproto *, uint16_t ofp_port);
 int ofproto_port_is_lacp_current(struct ofproto *, uint16_t ofp_port);
 
 /* Configuration of bundles. */
 struct ofproto_bundle_settings {
     char *name;                 /* For use in log messages. */
 
-    uint32_t *slaves;           /* OpenFlow port numbers for slaves. */
+    uint16_t *slaves;           /* OpenFlow port numbers for slaves. */
     size_t n_slaves;
 
     int vlan;                   /* VLAN if access port, -1 if trunk port. */
     unsigned long *trunks;      /* vlan_bitmap, NULL to trunk all VLANs. */
 
     struct bond_settings *bond; /* Must be nonnull iff if n_slaves > 1. */
+    uint32_t *bond_stable_ids;  /* Array of n_slaves elements. */
 
     struct lacp_settings *lacp;              /* Nonnull to enable LACP. */
     struct lacp_slave_settings *lacp_slaves; /* Array of n_slaves elements. */
 };
 
-void ofproto_bundle_register(struct ofproto *, void *aux,
-                             const struct ofproto_bundle_settings *);
-void ofproto_bundle_unregister(struct ofproto *, void *aux);
+int ofproto_bundle_register(struct ofproto *, void *aux,
+                            const struct ofproto_bundle_settings *);
+int ofproto_bundle_unregister(struct ofproto *, void *aux);
 
 /* Configuration of mirrors. */
 struct ofproto_mirror_settings {
@@ -212,11 +218,11 @@ struct ofproto_mirror_settings {
     uint16_t out_vlan;          /* Output VLAN, only if out_bundle is NULL. */
 };
 
-void ofproto_mirror_register(struct ofproto *, void *aux,
-                             const struct ofproto_mirror_settings *);
-void ofproto_mirror_unregister(struct ofproto *, void *aux);
+int ofproto_mirror_register(struct ofproto *, void *aux,
+                            const struct ofproto_mirror_settings *);
+int ofproto_mirror_unregister(struct ofproto *, void *aux);
 
-void ofproto_set_flood_vlans(struct ofproto *, unsigned long *flood_vlans);
+int ofproto_set_flood_vlans(struct ofproto *, unsigned long *flood_vlans);
 bool ofproto_is_mirror_output_bundle(struct ofproto *, void *aux);
 
 /* Configuration querying. */