X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif.h;h=fd05b2f20f35fbb3dce93c5e2dca3280f314762b;hb=67680b012be30d9c26eab999b83b08c6eb32dbd2;hp=c5e3fc810bd11e77178b2ad9f6ac748e677fcd99;hpb=305b76debf72120672a8ba81d3356b6dccb1da9a;p=sliver-openvswitch.git diff --git a/lib/dpif.h b/lib/dpif.h index c5e3fc810..fd05b2f20 100644 --- a/lib/dpif.h +++ b/lib/dpif.h @@ -540,10 +540,10 @@ const char *dpif_upcall_type_to_string(enum dpif_upcall_type); /* A packet passed up from the datapath to userspace. * - * If 'key' or 'actions' is nonnull, then it points into data owned by - * 'packet', so their memory cannot be freed separately. (This is hardly a - * great way to do things but it works out OK for the dpif providers and - * clients that exist so far.) + * If 'key', 'actions', or 'userdata' is nonnull, then it points into data + * owned by 'packet', so their memory cannot be freed separately. (This is + * hardly a great way to do things but it works out OK for the dpif providers + * and clients that exist so far.) */ struct dpif_upcall { /* All types. */ @@ -553,7 +553,7 @@ struct dpif_upcall { size_t key_len; /* Length of 'key' in bytes. */ /* DPIF_UC_ACTION only. */ - uint64_t userdata; /* Argument to OVS_ACTION_ATTR_USERSPACE. */ + struct nlattr *userdata; /* Argument to OVS_ACTION_ATTR_USERSPACE. */ }; int dpif_recv_set(struct dpif *, bool enable);