Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 184954
b: refs/heads/master
c: d3f2c67
h: refs/heads/master
v: v3
  • Loading branch information
Alexander Chiang authored and Roland Dreier committed Feb 24, 2010
1 parent 4fba7af commit dd018fa
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 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: 8698d3feccda66fcb52748e7c7690bd1003f7849
refs/heads/master: d3f2c67f2d10675f45b0d9257269420e9f59aa1a
26 changes: 13 additions & 13 deletions trunk/drivers/infiniband/core/user_mad.c
Original file line number Diff line number Diff line change
Expand Up @@ -487,8 +487,8 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf,
ah_attr.ah_flags = IB_AH_GRH;
memcpy(ah_attr.grh.dgid.raw, packet->mad.hdr.gid, 16);
ah_attr.grh.sgid_index = packet->mad.hdr.gid_index;
ah_attr.grh.flow_label = be32_to_cpu(packet->mad.hdr.flow_label);
ah_attr.grh.hop_limit = packet->mad.hdr.hop_limit;
ah_attr.grh.flow_label = be32_to_cpu(packet->mad.hdr.flow_label);
ah_attr.grh.hop_limit = packet->mad.hdr.hop_limit;
ah_attr.grh.traffic_class = packet->mad.hdr.traffic_class;
}

Expand Down Expand Up @@ -519,9 +519,9 @@ static ssize_t ib_umad_write(struct file *filp, const char __user *buf,
goto err_ah;
}

packet->msg->ah = ah;
packet->msg->ah = ah;
packet->msg->timeout_ms = packet->mad.hdr.timeout_ms;
packet->msg->retries = packet->mad.hdr.retries;
packet->msg->retries = packet->mad.hdr.retries;
packet->msg->context[0] = packet;

/* Copy MAD header. Any RMPP header is already in place. */
Expand Down Expand Up @@ -856,16 +856,16 @@ static int ib_umad_close(struct inode *inode, struct file *filp)
}

static const struct file_operations umad_fops = {
.owner = THIS_MODULE,
.read = ib_umad_read,
.write = ib_umad_write,
.poll = ib_umad_poll,
.owner = THIS_MODULE,
.read = ib_umad_read,
.write = ib_umad_write,
.poll = ib_umad_poll,
.unlocked_ioctl = ib_umad_ioctl,
#ifdef CONFIG_COMPAT
.compat_ioctl = ib_umad_compat_ioctl,
.compat_ioctl = ib_umad_compat_ioctl,
#endif
.open = ib_umad_open,
.release = ib_umad_close
.open = ib_umad_open,
.release = ib_umad_close
};

static int ib_umad_sm_open(struct inode *inode, struct file *filp)
Expand Down Expand Up @@ -930,8 +930,8 @@ static int ib_umad_sm_close(struct inode *inode, struct file *filp)
}

static const struct file_operations umad_sm_fops = {
.owner = THIS_MODULE,
.open = ib_umad_sm_open,
.owner = THIS_MODULE,
.open = ib_umad_sm_open,
.release = ib_umad_sm_close
};

Expand Down

0 comments on commit dd018fa

Please sign in to comment.