IB/core: Make uverbs flow structure use names like verbs ones

This patch adds "flow" prefix to most of data structure added as part
of commit 436f2ad05a0b ("IB/core: Export ib_create/destroy_flow through
uverbs") to keep those names in sync with the data structures added in
commit 319a441d1361 ("IB/core: Add receive flow steering support").

It's just a matter of translating 'ib_flow' to 'ib_uverbs_flow'.

Signed-off-by: Yann Droneaud <ydroneaud@opteya.com>
Link: http://marc.info/?i=cover.1383773832.git.ydroneaud@opteya.com
Signed-off-by: Roland Dreier <roland@purestorage.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
index f83c1dc08481..19f14d82c988 100644
--- a/drivers/infiniband/core/uverbs_cmd.c
+++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -2602,7 +2602,7 @@ out_put:
 }
 
 #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
-static int kern_spec_to_ib_spec(struct ib_uverbs_spec *kern_spec,
+static int kern_spec_to_ib_spec(struct ib_uverbs_flow_spec *kern_spec,
                                 union ib_flow_spec *ib_spec)
 {
         ib_spec->type = kern_spec->type;
@@ -2676,7 +2676,7 @@ ssize_t ib_uverbs_create_flow(struct ib_uverbs_file *file,
 
         if (cmd.flow_attr.size > (in_len - sizeof(cmd)) ||
             cmd.flow_attr.size >
-            (cmd.flow_attr.num_of_specs * sizeof(struct ib_uverbs_spec)))
+            (cmd.flow_attr.num_of_specs * sizeof(struct ib_uverbs_flow_spec)))
                 return -EINVAL;
 
         if (cmd.flow_attr.num_of_specs) {
@@ -2725,16 +2725,16 @@ ssize_t ib_uverbs_create_flow(struct ib_uverbs_file *file,
         kern_spec = kern_flow_attr + 1;
         ib_spec = flow_attr + 1;
         for (i = 0; i < flow_attr->num_of_specs &&
-             cmd.flow_attr.size > offsetof(struct ib_uverbs_spec, reserved) &&
+             cmd.flow_attr.size > offsetof(struct ib_uverbs_flow_spec, reserved) &&
              cmd.flow_attr.size >=
-             ((struct ib_uverbs_spec *)kern_spec)->size; i++) {
+             ((struct ib_uverbs_flow_spec *)kern_spec)->size; i++) {
                 err = kern_spec_to_ib_spec(kern_spec, ib_spec);
                 if (err)
                         goto err_free;
                 flow_attr->size +=
                         ((union ib_flow_spec *) ib_spec)->size;
-                cmd.flow_attr.size -= ((struct ib_uverbs_spec *)kern_spec)->size;
-                kern_spec += ((struct ib_uverbs_spec *) kern_spec)->size;
+                cmd.flow_attr.size -= ((struct ib_uverbs_flow_spec *)kern_spec)->size;
+                kern_spec += ((struct ib_uverbs_flow_spec *) kern_spec)->size;
                 ib_spec += ((union ib_flow_spec *) ib_spec)->size;
         }
         if (cmd.flow_attr.size || (i != flow_attr->num_of_specs)) {