Merge branch 'linus' into irq/core, to fix conflict

[sfrench/cifs-2.6.git] / drivers / infiniband / core / uverbs_marshall.c

diff --git a/drivers/infiniband/core/uverbs_marshall.c b/drivers/infiniband/core/uverbs_marshall.c
index b8d715c68ca44e3c41bf87f1547384b40c82d4a4..11a0806469162640d32c094f55c1ae2d3913b20f 100644 (file)
--- a/drivers/infiniband/core/uverbs_marshall.c
+++ b/drivers/infiniband/core/uverbs_marshall.c
@@ -66,7 +66,7 @@ void ib_copy_ah_attr_to_user(struct ib_device *device,
        struct rdma_ah_attr *src = ah_attr;
        struct rdma_ah_attr conv_ah;
 
-       memset(&dst->grh.reserved, 0, sizeof(dst->grh.reserved));
+       memset(&dst->grh, 0, sizeof(dst->grh));
 
        if ((ah_attr->type == RDMA_AH_ATTR_TYPE_OPA) &&
            (rdma_ah_get_dlid(ah_attr) > be16_to_cpu(IB_LID_PERMISSIVE)) &&