Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 280595
b: refs/heads/master
c: 6f233d3
h: refs/heads/master
i:
  280593: f0df083
  280591: 1d72dc4
v: v3
  • Loading branch information
Eli Cohen authored and Roland Dreier committed Jan 4, 2012
1 parent 7da143a commit ca0e91c
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c89d1bedf8b130d5b20f56a484989a19a2c2842a
refs/heads/master: 6f233d300d301b08b4627fbcf29dfc4eda16e4d8
1 change: 1 addition & 0 deletions trunk/drivers/infiniband/core/cm_msgs.h
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,7 @@ struct cm_apr_msg {

u8 info_length;
u8 ap_status;
__be16 rsvd;
u8 info[IB_CM_APR_INFO_LENGTH];

u8 private_data[IB_CM_APR_PRIVATE_DATA_SIZE];
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/infiniband/core/cma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1110,7 +1110,7 @@ static struct rdma_id_private *cma_new_conn_id(struct rdma_cm_id *listen_id,
if (cma_any_addr((struct sockaddr *) &rt->addr.src_addr)) {
rt->addr.dev_addr.dev_type = ARPHRD_INFINIBAND;
rdma_addr_set_sgid(&rt->addr.dev_addr, &rt->path_rec[0].sgid);
ib_addr_set_pkey(&rt->addr.dev_addr, be16_to_cpu(rt->path_rec[0].pkey));
ib_addr_set_pkey(&rt->addr.dev_addr, rt->path_rec[0].pkey);
} else {
ret = rdma_translate_ip((struct sockaddr *) &rt->addr.src_addr,
&rt->addr.dev_addr);
Expand Down Expand Up @@ -2926,7 +2926,7 @@ static int cma_ib_mc_handler(int status, struct ib_sa_multicast *multicast)
mutex_lock(&id_priv->qp_mutex);
if (!status && id_priv->id.qp)
status = ib_attach_mcast(id_priv->id.qp, &multicast->rec.mgid,
be16_to_cpu(multicast->rec.mlid));
multicast->rec.mlid);
mutex_unlock(&id_priv->qp_mutex);

memset(&event, 0, sizeof event);
Expand Down Expand Up @@ -3187,7 +3187,7 @@ void rdma_leave_multicast(struct rdma_cm_id *id, struct sockaddr *addr)
if (id->qp)
ib_detach_mcast(id->qp,
&mc->multicast.ib->rec.mgid,
be16_to_cpu(mc->multicast.ib->rec.mlid));
mc->multicast.ib->rec.mlid);
if (rdma_node_get_transport(id_priv->cma_dev->device->node_type) == RDMA_TRANSPORT_IB) {
switch (rdma_port_get_link_layer(id->device, id->port_num)) {
case IB_LINK_LAYER_INFINIBAND:
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/infiniband/core/ucm.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ enum {
IB_UCM_MAX_DEVICES = 32
};

/* ib_cm and ib_user_cm modules share /sys/class/infiniband_cm */
extern struct class cm_class;

#define IB_UCM_BASE_DEV MKDEV(IB_UCM_MAJOR, IB_UCM_BASE_MINOR)

static void ib_ucm_add_one(struct ib_device *device);
Expand Down
6 changes: 3 additions & 3 deletions trunk/drivers/infiniband/core/uverbs_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -2446,9 +2446,9 @@ ssize_t ib_uverbs_detach_mcast(struct ib_uverbs_file *file,
return ret ? ret : in_len;
}

static int __uverbs_create_xsrq(struct ib_uverbs_file *file,
struct ib_uverbs_create_xsrq *cmd,
struct ib_udata *udata)
int __uverbs_create_xsrq(struct ib_uverbs_file *file,
struct ib_uverbs_create_xsrq *cmd,
struct ib_udata *udata)
{
struct ib_uverbs_create_srq_resp resp;
struct ib_usrq_object *obj;
Expand Down
2 changes: 1 addition & 1 deletion trunk/include/rdma/ib_addr.h
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ static inline u16 rdma_get_vlan_id(union ib_gid *dgid)
static inline struct net_device *rdma_vlan_dev_real_dev(const struct net_device *dev)
{
return dev->priv_flags & IFF_802_1Q_VLAN ?
vlan_dev_real_dev(dev) : NULL;
vlan_dev_real_dev(dev) : 0;
}

#endif /* IB_ADDR_H */
3 changes: 0 additions & 3 deletions trunk/include/rdma/ib_cm.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@
#include <rdma/ib_mad.h>
#include <rdma/ib_sa.h>

/* ib_cm and ib_user_cm modules share /sys/class/infiniband_cm */
extern struct class cm_class;

enum ib_cm_state {
IB_CM_IDLE,
IB_CM_LISTEN,
Expand Down

0 comments on commit ca0e91c

Please sign in to comment.