X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdpif-provider.h;h=5d651c6e0036136136698843f0d2cfd179960bb3;hb=db164669c1b482843e082e752d8fbd69f650f94a;hp=b2f9d4bd1bfc7c856b799c6a29a3dade628ac821;hpb=aae51f53358dc7946f7f09a88b1e0dd40306a99a;p=openvswitch

diff --git a/lib/dpif-provider.h b/lib/dpif-provider.h
index b2f9d4bd..5d651c6e 100644
--- a/lib/dpif-provider.h
+++ b/lib/dpif-provider.h
@@ -183,20 +183,6 @@ struct dpif_class {
      * value other than EAGAIN. */
     void (*port_poll_wait)(const struct dpif *dpif);
 
-    /* Stores in 'ports' the port numbers of up to 'n' ports that belong to
-     * 'group' in 'dpif'.  Returns the number of ports in 'group' (not the
-     * number stored), if successful, otherwise a negative errno value. */
-    int (*port_group_get)(const struct dpif *dpif, int group,
-                          uint16_t ports[], int n);
-
-    /* Changes port group 'group' in 'dpif' to consist of the 'n' ports whose
-     * numbers are given in 'ports'.
-     *
-     * Use the get_stats member function to obtain the number of supported port
-     * groups. */
-    int (*port_group_set)(struct dpif *dpif, int group,
-                          const uint16_t ports[], int n);
-
     /* For each flow 'flow' in the 'n' flows in 'flows':
      *
      * - If a flow matching 'flow->key' exists in 'dpif':
@@ -262,14 +248,8 @@ struct dpif_class {
     int (*flow_list)(const struct dpif *dpif, struct odp_flow flows[], int n);
 
     /* Performs the 'n_actions' actions in 'actions' on the Ethernet frame
-     * specified in 'packet'.
-     *
-     * Pretends that the frame was originally received on the port numbered
-     * 'in_port'.  This affects only ODPAT_OUTPUT_GROUP actions, which will not
-     * send a packet out their input port.  Specify the number of an unused
-     * port (e.g. UINT16_MAX is currently always unused) to avoid this
-     * behavior. */
-    int (*execute)(struct dpif *dpif, uint16_t in_port,
+     * specified in 'packet'. */
+    int (*execute)(struct dpif *dpif,
                    const union odp_action actions[], int n_actions,
                    const struct ofpbuf *packet);
 
@@ -324,14 +304,6 @@ struct dpif_class {
     void (*recv_wait)(struct dpif *dpif);
 };
 
-/* Minimum number of bytes of headroom for a packet returned by the 'recv'
- * member function (see above).  This headroom allows "struct odp_msg" to be
- * replaced by "struct ofp_packet_in" without copying the buffer. */
-#define DPIF_RECV_MSG_PADDING (sizeof(struct ofp_packet_in) \
-                               - sizeof(struct odp_msg))
-BUILD_ASSERT_DECL(sizeof(struct ofp_packet_in) > sizeof(struct odp_msg));
-BUILD_ASSERT_DECL(DPIF_RECV_MSG_PADDING % 4 == 0);
-
 extern const struct dpif_class dpif_linux_class;
 extern const struct dpif_class dpif_netdev_class;