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.
Showing the changes to include/uapi (1 of 2 files). Show all
Unified · Split
| @@ -701,61 +701,61 @@ struct ib_uverbs_detach_mcast { · 700 unmodified lines | ||
| 701 | 701 | }; |
| 702 | 702 | |
| 703 | 703 | #ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING |
| 704 | −struct ib_kern_eth_filter { | |
| 704 | +struct ib_uverbs_eth_filter { | |
| 705 | 705 | __u8 dst_mac[6]; |
| 706 | 706 | __u8 src_mac[6]; |
| 707 | 707 | __be16 ether_type; |
| 708 | 708 | __be16 vlan_tag; |
| 709 | 709 | }; |
| 710 | 710 | |
| 711 | −struct ib_kern_spec_eth { | |
| 711 | +struct ib_uverbs_spec_eth { | |
| 712 | 712 | __u32 type; |
| 713 | 713 | __u16 size; |
| 714 | 714 | __u16 reserved; |
| 715 | − struct ib_kern_eth_filter val; | |
| 716 | − struct ib_kern_eth_filter mask; | |
| 715 | + struct ib_uverbs_eth_filter val; | |
| 716 | + struct ib_uverbs_eth_filter mask; | |
| 717 | 717 | }; |
| 718 | 718 | |
| 719 | −struct ib_kern_ipv4_filter { | |
| 719 | +struct ib_uverbs_ipv4_filter { | |
| 720 | 720 | __be32 src_ip; |
| 721 | 721 | __be32 dst_ip; |
| 722 | 722 | }; |
| 723 | 723 | |
| 724 | −struct ib_kern_spec_ipv4 { | |
| 724 | +struct ib_uverbs_spec_ipv4 { | |
| 725 | 725 | __u32 type; |
| 726 | 726 | __u16 size; |
| 727 | 727 | __u16 reserved; |
| 728 | − struct ib_kern_ipv4_filter val; | |
| 729 | − struct ib_kern_ipv4_filter mask; | |
| 728 | + struct ib_uverbs_ipv4_filter val; | |
| 729 | + struct ib_uverbs_ipv4_filter mask; | |
| 730 | 730 | }; |
| 731 | 731 | |
| 732 | −struct ib_kern_tcp_udp_filter { | |
| 732 | +struct ib_uverbs_tcp_udp_filter { | |
| 733 | 733 | __be16 dst_port; |
| 734 | 734 | __be16 src_port; |
| 735 | 735 | }; |
| 736 | 736 | |
| 737 | −struct ib_kern_spec_tcp_udp { | |
| 737 | +struct ib_uverbs_spec_tcp_udp { | |
| 738 | 738 | __u32 type; |
| 739 | 739 | __u16 size; |
| 740 | 740 | __u16 reserved; |
| 741 | − struct ib_kern_tcp_udp_filter val; | |
| 742 | − struct ib_kern_tcp_udp_filter mask; | |
| 741 | + struct ib_uverbs_tcp_udp_filter val; | |
| 742 | + struct ib_uverbs_tcp_udp_filter mask; | |
| 743 | 743 | }; |
| 744 | 744 | |
| 745 | −struct ib_kern_spec { | |
| 745 | +struct ib_uverbs_spec { | |
| 746 | 746 | union { |
| 747 | 747 | struct { |
| 748 | 748 | __u32 type; |
| 749 | 749 | __u16 size; |
| 750 | 750 | __u16 reserved; |
| 751 | 751 | }; |
| 752 | − struct ib_kern_spec_eth eth; | |
| 753 | − struct ib_kern_spec_ipv4 ipv4; | |
| 754 | − struct ib_kern_spec_tcp_udp tcp_udp; | |
| 752 | + struct ib_uverbs_spec_eth eth; | |
| 753 | + struct ib_uverbs_spec_ipv4 ipv4; | |
| 754 | + struct ib_uverbs_spec_tcp_udp tcp_udp; | |
| 755 | 755 | }; |
| 756 | 756 | }; |
| 757 | 757 | |
| 758 | −struct ib_kern_flow_attr { | |
| 758 | +struct ib_uverbs_flow_attr { | |
| 759 | 759 | __u32 type; |
| 760 | 760 | __u16 size; |
| 761 | 761 | __u16 priority; |
| @@ -774,7 +774,7 @@ struct ib_uverbs_create_flow { · 12 unmodified lines | ||
| 774 | 774 | __u32 reserved; |
| 775 | 775 | __u64 response; |
| 776 | 776 | __u32 qp_handle; |
| 777 | − struct ib_kern_flow_attr flow_attr; | |
| 777 | + struct ib_uverbs_flow_attr flow_attr; | |
| 778 | 778 | }; |
| 779 | 779 | |
| 780 | 780 | struct ib_uverbs_create_flow_resp { |