diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/infiniband/hw/ipath/ipath_ud.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/infiniband/hw/ipath/ipath_ud.c')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_ud.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_ud.c b/drivers/infiniband/hw/ipath/ipath_ud.c index 7420715256a9..e8a2a915251e 100644 --- a/drivers/infiniband/hw/ipath/ipath_ud.c +++ b/drivers/infiniband/hw/ipath/ipath_ud.c | |||
| @@ -86,7 +86,7 @@ static void ipath_ud_loopback(struct ipath_qp *sqp, struct ipath_swqe *swqe) | |||
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | /* | 88 | /* |
| 89 | * A GRH is expected to preceed the data even if not | 89 | * A GRH is expected to precede the data even if not |
| 90 | * present on the wire. | 90 | * present on the wire. |
| 91 | */ | 91 | */ |
| 92 | length = swqe->length; | 92 | length = swqe->length; |
| @@ -515,7 +515,7 @@ void ipath_ud_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, | |||
| 515 | } | 515 | } |
| 516 | 516 | ||
| 517 | /* | 517 | /* |
| 518 | * A GRH is expected to preceed the data even if not | 518 | * A GRH is expected to precede the data even if not |
| 519 | * present on the wire. | 519 | * present on the wire. |
| 520 | */ | 520 | */ |
| 521 | wc.byte_len = tlen + sizeof(struct ib_grh); | 521 | wc.byte_len = tlen + sizeof(struct ib_grh); |