aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorYann Droneaud <ydroneaud@opteya.com>2013-11-06 17:21:45 -0500
committerRoland Dreier <roland@purestorage.com>2013-11-17 11:22:08 -0500
commitd82693dad09b49232cd727ee9e15bd027710edac (patch)
tree5bd62dd35fdba2420afec01b22031dda599cd74c /include
parentf88482743872230f5899b8344a057d6e2fd011e2 (diff)
IB/core: Rename 'flow' structs to match other uverbs structs
Commit 436f2ad05a0b ("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>
Diffstat (limited to 'include')
-rw-r--r--include/uapi/rdma/ib_user_verbs.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h
index 99a58bdc1c64..96a660533236 100644
--- a/include/uapi/rdma/ib_user_verbs.h
+++ b/include/uapi/rdma/ib_user_verbs.h
@@ -701,61 +701,61 @@ struct ib_uverbs_detach_mcast {
701}; 701};
702 702
703#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING 703#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
704struct ib_kern_eth_filter { 704struct ib_uverbs_eth_filter {
705 __u8 dst_mac[6]; 705 __u8 dst_mac[6];
706 __u8 src_mac[6]; 706 __u8 src_mac[6];
707 __be16 ether_type; 707 __be16 ether_type;
708 __be16 vlan_tag; 708 __be16 vlan_tag;
709}; 709};
710 710
711struct ib_kern_spec_eth { 711struct ib_uverbs_spec_eth {
712 __u32 type; 712 __u32 type;
713 __u16 size; 713 __u16 size;
714 __u16 reserved; 714 __u16 reserved;
715 struct ib_kern_eth_filter val; 715 struct ib_uverbs_eth_filter val;
716 struct ib_kern_eth_filter mask; 716 struct ib_uverbs_eth_filter mask;
717}; 717};
718 718
719struct ib_kern_ipv4_filter { 719struct ib_uverbs_ipv4_filter {
720 __be32 src_ip; 720 __be32 src_ip;
721 __be32 dst_ip; 721 __be32 dst_ip;
722}; 722};
723 723
724struct ib_kern_spec_ipv4 { 724struct ib_uverbs_spec_ipv4 {
725 __u32 type; 725 __u32 type;
726 __u16 size; 726 __u16 size;
727 __u16 reserved; 727 __u16 reserved;
728 struct ib_kern_ipv4_filter val; 728 struct ib_uverbs_ipv4_filter val;
729 struct ib_kern_ipv4_filter mask; 729 struct ib_uverbs_ipv4_filter mask;
730}; 730};
731 731
732struct ib_kern_tcp_udp_filter { 732struct ib_uverbs_tcp_udp_filter {
733 __be16 dst_port; 733 __be16 dst_port;
734 __be16 src_port; 734 __be16 src_port;
735}; 735};
736 736
737struct ib_kern_spec_tcp_udp { 737struct ib_uverbs_spec_tcp_udp {
738 __u32 type; 738 __u32 type;
739 __u16 size; 739 __u16 size;
740 __u16 reserved; 740 __u16 reserved;
741 struct ib_kern_tcp_udp_filter val; 741 struct ib_uverbs_tcp_udp_filter val;
742 struct ib_kern_tcp_udp_filter mask; 742 struct ib_uverbs_tcp_udp_filter mask;
743}; 743};
744 744
745struct ib_kern_spec { 745struct ib_uverbs_spec {
746 union { 746 union {
747 struct { 747 struct {
748 __u32 type; 748 __u32 type;
749 __u16 size; 749 __u16 size;
750 __u16 reserved; 750 __u16 reserved;
751 }; 751 };
752 struct ib_kern_spec_eth eth; 752 struct ib_uverbs_spec_eth eth;
753 struct ib_kern_spec_ipv4 ipv4; 753 struct ib_uverbs_spec_ipv4 ipv4;
754 struct ib_kern_spec_tcp_udp tcp_udp; 754 struct ib_uverbs_spec_tcp_udp tcp_udp;
755 }; 755 };
756}; 756};
757 757
758struct ib_kern_flow_attr { 758struct ib_uverbs_flow_attr {
759 __u32 type; 759 __u32 type;
760 __u16 size; 760 __u16 size;
761 __u16 priority; 761 __u16 priority;
@@ -774,7 +774,7 @@ struct ib_uverbs_create_flow {
774 __u32 reserved; 774 __u32 reserved;
775 __u64 response; 775 __u64 response;
776 __u32 qp_handle; 776 __u32 qp_handle;
777 struct ib_kern_flow_attr flow_attr; 777 struct ib_uverbs_flow_attr flow_attr;
778}; 778};
779 779
780struct ib_uverbs_create_flow_resp { 780struct ib_uverbs_create_flow_resp {