Skip to content

Commit

Permalink
IB/core: Rename 'flow' structs to match other uverbs structs
Browse files Browse the repository at this point in the history 
Commit 436f2ad ("IB/core: Export ib_create/destroy_flow through
uverbs") added public data structures to support receive flow
steering.  The new structs are not following the 'uverbs' pattern:
they're lacking the common prefix 'ib_uverbs'.

This patch replaces ib_kern prefix by ib_uverbs.

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>
  • Loading branch information
@ydroneaud @rolandd
ydroneaud authored and rolandd committed Nov 17, 2013
1 parent f884827 commit d82693d
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 25 deletions.
14 changes: 7 additions & 7 deletions drivers/infiniband/core/uverbs_cmd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2602,7 +2602,7 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file,
}

#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
static int kern_spec_to_ib_spec(struct ib_kern_spec *kern_spec,
static int kern_spec_to_ib_spec(struct ib_uverbs_spec *kern_spec,
union ib_flow_spec *ib_spec)
{
ib_spec->type = kern_spec->type;
Expand Down Expand Up @@ -2650,7 +2650,7 @@ ssize_t ib_uverbs_create_flow(struct ib_uverbs_file *file,
struct ib_uverbs_create_flow_resp resp;
struct ib_uobject *uobj;
struct ib_flow *flow_id;
struct ib_kern_flow_attr *kern_flow_attr;
struct ib_uverbs_flow_attr *kern_flow_attr;
struct ib_flow_attr *flow_attr;
struct ib_qp *qp;
int err = 0;
Expand All @@ -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_kern_spec)))
(cmd.flow_attr.num_of_specs * sizeof(struct ib_uverbs_spec)))
return -EINVAL;

if (cmd.flow_attr.num_of_specs) {
Expand Down Expand Up @@ -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_kern_spec, reserved) &&
cmd.flow_attr.size > offsetof(struct ib_uverbs_spec, reserved) &&
cmd.flow_attr.size >=
((struct ib_kern_spec *)kern_spec)->size; i++) {
((struct ib_uverbs_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_kern_spec *)kern_spec)->size;
kern_spec += ((struct ib_kern_spec *) kern_spec)->size;
cmd.flow_attr.size -= ((struct ib_uverbs_spec *)kern_spec)->size;
kern_spec += ((struct ib_uverbs_spec *) kern_spec)->size;
ib_spec += ((union ib_flow_spec *) ib_spec)->size;
}
if (cmd.flow_attr.size || (i != flow_attr->num_of_specs)) {
Expand Down
36 changes: 18 additions & 18 deletions include/uapi/rdma/ib_user_verbs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -701,61 +701,61 @@ struct ib_uverbs_detach_mcast {
};

#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
struct ib_kern_eth_filter {
struct ib_uverbs_eth_filter {
__u8 dst_mac[6];
__u8 src_mac[6];
__be16 ether_type;
__be16 vlan_tag;
};

struct ib_kern_spec_eth {
struct ib_uverbs_spec_eth {
__u32 type;
__u16 size;
__u16 reserved;
struct ib_kern_eth_filter val;
struct ib_kern_eth_filter mask;
struct ib_uverbs_eth_filter val;
struct ib_uverbs_eth_filter mask;
};

struct ib_kern_ipv4_filter {
struct ib_uverbs_ipv4_filter {
__be32 src_ip;
__be32 dst_ip;
};

struct ib_kern_spec_ipv4 {
struct ib_uverbs_spec_ipv4 {
__u32 type;
__u16 size;
__u16 reserved;
struct ib_kern_ipv4_filter val;
struct ib_kern_ipv4_filter mask;
struct ib_uverbs_ipv4_filter val;
struct ib_uverbs_ipv4_filter mask;
};

struct ib_kern_tcp_udp_filter {
struct ib_uverbs_tcp_udp_filter {
__be16 dst_port;
__be16 src_port;
};

struct ib_kern_spec_tcp_udp {
struct ib_uverbs_spec_tcp_udp {
__u32 type;
__u16 size;
__u16 reserved;
struct ib_kern_tcp_udp_filter val;
struct ib_kern_tcp_udp_filter mask;
struct ib_uverbs_tcp_udp_filter val;
struct ib_uverbs_tcp_udp_filter mask;
};

struct ib_kern_spec {
struct ib_uverbs_spec {
union {
struct {
__u32 type;
__u16 size;
__u16 reserved;
};
struct ib_kern_spec_eth eth;
struct ib_kern_spec_ipv4 ipv4;
struct ib_kern_spec_tcp_udp tcp_udp;
struct ib_uverbs_spec_eth eth;
struct ib_uverbs_spec_ipv4 ipv4;
struct ib_uverbs_spec_tcp_udp tcp_udp;
};
};

struct ib_kern_flow_attr {
struct ib_uverbs_flow_attr {
__u32 type;
__u16 size;
__u16 priority;
Expand All @@ -774,7 +774,7 @@ struct ib_uverbs_create_flow {
__u32 reserved;
__u64 response;
__u32 qp_handle;
struct ib_kern_flow_attr flow_attr;
struct ib_uverbs_flow_attr flow_attr;
};

struct ib_uverbs_create_flow_resp {
Expand Down

0 comments on commit d82693d

Please sign in to comment.