projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
[linux-2.6-microblaze.git]
/
drivers
/
infiniband
/
hw
/
mlx4
/
cq.c
diff --git
a/drivers/infiniband/hw/mlx4/cq.c
b/drivers/infiniband/hw/mlx4/cq.c
index
2f42595
..
5fd49f9
100644
(file)
--- a/
drivers/infiniband/hw/mlx4/cq.c
+++ b/
drivers/infiniband/hw/mlx4/cq.c
@@
-871,7
+871,7
@@
repoll:
if (is_eth) {
wc->sl = be16_to_cpu(cqe->sl_vid) >> 13;
if (be32_to_cpu(cqe->vlan_my_qpn) &
- MLX4_CQE_VLAN_PRESENT_MASK) {
+ MLX4_CQE_
C
VLAN_PRESENT_MASK) {
wc->vlan_id = be16_to_cpu(cqe->sl_vid) &
MLX4_CQE_VID_MASK;
} else {