Skip to content

Commit e44ee2f

Browse files
rleondledford
authored andcommitted
IB/cxgb4: Move user vendor structures
This patch moves cxgb4 vendor's specific structures to common UAPI folder which will be visible to all consumers. These structures are used by user-space library driver (libcxgb4) and currently manually copied to that library. This move will allow cross-compile against these files and simplify introduction of vendor specific data. Signed-off-by: Leon Romanovsky <[email protected]> Reviewed-by: Steve Wise <[email protected]> Signed-off-by: Doug Ledford <[email protected]>
1 parent a85fb33 commit e44ee2f

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3482,6 +3482,7 @@ L: [email protected]
34823482
W: http://www.openfabrics.org
34833483
S: Supported
34843484
F: drivers/infiniband/hw/cxgb4/
3485+
F: include/uapi/rdma/cxgb4-abi.h
34853486

34863487
CXGB4VF ETHERNET DRIVER (CXGB4VF)
34873488
M: Casey Leedom <[email protected]>

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
#include "cxgb4.h"
5959
#include "cxgb4_uld.h"
6060
#include "l2t.h"
61-
#include "user.h"
61+
#include <rdma/cxgb4-abi.h>
6262

6363
#define DRV_NAME "iw_cxgb4"
6464
#define MOD DRV_NAME ":"

include/uapi/rdma/Kbuild

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ header-y += rdma_user_cm.h
88
header-y += hfi/
99
header-y += rdma_user_rxe.h
1010
header-y += cxgb3-abi.h
11+
header-y += cxgb4-abi.h
1112
header-y += mlx5-abi.h

drivers/infiniband/hw/cxgb4/user.h renamed to include/uapi/rdma/cxgb4-abi.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3030
* SOFTWARE.
3131
*/
32-
#ifndef __C4IW_USER_H__
33-
#define __C4IW_USER_H__
32+
#ifndef CXGB4_ABI_USER_H
33+
#define CXGB4_ABI_USER_H
34+
35+
#include <linux/types.h>
3436

3537
#define C4IW_UVERBS_ABI_VERSION 3
3638

@@ -51,9 +53,8 @@ struct c4iw_create_cq_resp {
5153
__u32 reserved; /* explicit padding (optional for i386) */
5254
};
5355

54-
5556
enum {
56-
C4IW_QPF_ONCHIP = (1<<0)
57+
C4IW_QPF_ONCHIP = (1 << 0)
5758
};
5859

5960
struct c4iw_create_qp_resp {
@@ -77,4 +78,4 @@ struct c4iw_alloc_ucontext_resp {
7778
__u32 status_page_size;
7879
__u32 reserved; /* explicit padding (optional for i386) */
7980
};
80-
#endif
81+
#endif /* CXGB4_ABI_USER_H */

0 commit comments

Comments
 (0)