diff options
-rw-r--r-- | drivers/infiniband/core/ucm.c | 3 | ||||
-rw-r--r-- | drivers/infiniband/core/uverbs_cmd.c | 6 | ||||
-rw-r--r-- | include/rdma/ib_addr.h | 2 | ||||
-rw-r--r-- | include/rdma/ib_cm.h | 3 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c index b8a0b4a7811b..06f08713f487 100644 --- a/drivers/infiniband/core/ucm.c +++ b/drivers/infiniband/core/ucm.c | |||
@@ -106,9 +106,6 @@ enum { | |||
106 | IB_UCM_MAX_DEVICES = 32 | 106 | IB_UCM_MAX_DEVICES = 32 |
107 | }; | 107 | }; |
108 | 108 | ||
109 | /* ib_cm and ib_user_cm modules share /sys/class/infiniband_cm */ | ||
110 | extern struct class cm_class; | ||
111 | |||
112 | #define IB_UCM_BASE_DEV MKDEV(IB_UCM_MAJOR, IB_UCM_BASE_MINOR) | 109 | #define IB_UCM_BASE_DEV MKDEV(IB_UCM_MAJOR, IB_UCM_BASE_MINOR) |
113 | 110 | ||
114 | static void ib_ucm_add_one(struct ib_device *device); | 111 | static void ib_ucm_add_one(struct ib_device *device); |
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index 254f1649c734..e26193f5f854 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c | |||
@@ -2446,9 +2446,9 @@ out_put: | |||
2446 | return ret ? ret : in_len; | 2446 | return ret ? ret : in_len; |
2447 | } | 2447 | } |
2448 | 2448 | ||
2449 | int __uverbs_create_xsrq(struct ib_uverbs_file *file, | 2449 | static int __uverbs_create_xsrq(struct ib_uverbs_file *file, |
2450 | struct ib_uverbs_create_xsrq *cmd, | 2450 | struct ib_uverbs_create_xsrq *cmd, |
2451 | struct ib_udata *udata) | 2451 | struct ib_udata *udata) |
2452 | { | 2452 | { |
2453 | struct ib_uverbs_create_srq_resp resp; | 2453 | struct ib_uverbs_create_srq_resp resp; |
2454 | struct ib_usrq_object *obj; | 2454 | struct ib_usrq_object *obj; |
diff --git a/include/rdma/ib_addr.h b/include/rdma/ib_addr.h index 639a4491fc0d..99965395c5f3 100644 --- a/include/rdma/ib_addr.h +++ b/include/rdma/ib_addr.h | |||
@@ -281,7 +281,7 @@ static inline u16 rdma_get_vlan_id(union ib_gid *dgid) | |||
281 | static inline struct net_device *rdma_vlan_dev_real_dev(const struct net_device *dev) | 281 | static inline struct net_device *rdma_vlan_dev_real_dev(const struct net_device *dev) |
282 | { | 282 | { |
283 | return dev->priv_flags & IFF_802_1Q_VLAN ? | 283 | return dev->priv_flags & IFF_802_1Q_VLAN ? |
284 | vlan_dev_real_dev(dev) : 0; | 284 | vlan_dev_real_dev(dev) : NULL; |
285 | } | 285 | } |
286 | 286 | ||
287 | #endif /* IB_ADDR_H */ | 287 | #endif /* IB_ADDR_H */ |
diff --git a/include/rdma/ib_cm.h b/include/rdma/ib_cm.h index c8f94e8db69c..83f77ac33957 100644 --- a/include/rdma/ib_cm.h +++ b/include/rdma/ib_cm.h | |||
@@ -38,6 +38,9 @@ | |||
38 | #include <rdma/ib_mad.h> | 38 | #include <rdma/ib_mad.h> |
39 | #include <rdma/ib_sa.h> | 39 | #include <rdma/ib_sa.h> |
40 | 40 | ||
41 | /* ib_cm and ib_user_cm modules share /sys/class/infiniband_cm */ | ||
42 | extern struct class cm_class; | ||
43 | |||
41 | enum ib_cm_state { | 44 | enum ib_cm_state { |
42 | IB_CM_IDLE, | 45 | IB_CM_IDLE, |
43 | IB_CM_LISTEN, | 46 | IB_CM_LISTEN, |