diff options
author | Michael S. Tsirkin <mst@mellanox.co.il> | 2006-07-14 03:23:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-15 00:53:50 -0400 |
commit | f0ee3404cce2c45f8b95b341dd6311cd92e5cee0 (patch) | |
tree | fc4a88c79310ea1937c6ede58c0a06f5b056078a /drivers | |
parent | 04c335430f6d9f9088c852bc05a3a0c8baa921c4 (diff) |
[PATCH] IB/addr: gid structure alignment fix
The device address contains unsigned character arrays, which contain raw GID
addresses. The GIDs may not be naturally aligned, so do not cast them to
structures or unions.
Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/infiniband/core/cma.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 863f64befc7c..c2cba734c5cb 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c | |||
@@ -262,14 +262,14 @@ static void cma_detach_from_dev(struct rdma_id_private *id_priv) | |||
262 | static int cma_acquire_ib_dev(struct rdma_id_private *id_priv) | 262 | static int cma_acquire_ib_dev(struct rdma_id_private *id_priv) |
263 | { | 263 | { |
264 | struct cma_device *cma_dev; | 264 | struct cma_device *cma_dev; |
265 | union ib_gid *gid; | 265 | union ib_gid gid; |
266 | int ret = -ENODEV; | 266 | int ret = -ENODEV; |
267 | 267 | ||
268 | gid = ib_addr_get_sgid(&id_priv->id.route.addr.dev_addr); | 268 | ib_addr_get_sgid(&id_priv->id.route.addr.dev_addr, &gid), |
269 | 269 | ||
270 | mutex_lock(&lock); | 270 | mutex_lock(&lock); |
271 | list_for_each_entry(cma_dev, &dev_list, list) { | 271 | list_for_each_entry(cma_dev, &dev_list, list) { |
272 | ret = ib_find_cached_gid(cma_dev->device, gid, | 272 | ret = ib_find_cached_gid(cma_dev->device, &gid, |
273 | &id_priv->id.port_num, NULL); | 273 | &id_priv->id.port_num, NULL); |
274 | if (!ret) { | 274 | if (!ret) { |
275 | cma_attach_to_dev(id_priv, cma_dev); | 275 | cma_attach_to_dev(id_priv, cma_dev); |
@@ -1134,8 +1134,8 @@ static int cma_query_ib_route(struct rdma_id_private *id_priv, int timeout_ms, | |||
1134 | struct ib_sa_path_rec path_rec; | 1134 | struct ib_sa_path_rec path_rec; |
1135 | 1135 | ||
1136 | memset(&path_rec, 0, sizeof path_rec); | 1136 | memset(&path_rec, 0, sizeof path_rec); |
1137 | path_rec.sgid = *ib_addr_get_sgid(addr); | 1137 | ib_addr_get_sgid(addr, &path_rec.sgid); |
1138 | path_rec.dgid = *ib_addr_get_dgid(addr); | 1138 | ib_addr_get_dgid(addr, &path_rec.dgid); |
1139 | path_rec.pkey = cpu_to_be16(ib_addr_get_pkey(addr)); | 1139 | path_rec.pkey = cpu_to_be16(ib_addr_get_pkey(addr)); |
1140 | path_rec.numb_path = 1; | 1140 | path_rec.numb_path = 1; |
1141 | 1141 | ||
@@ -1263,7 +1263,7 @@ static int cma_bind_loopback(struct rdma_id_private *id_priv) | |||
1263 | { | 1263 | { |
1264 | struct cma_device *cma_dev; | 1264 | struct cma_device *cma_dev; |
1265 | struct ib_port_attr port_attr; | 1265 | struct ib_port_attr port_attr; |
1266 | union ib_gid *gid; | 1266 | union ib_gid gid; |
1267 | u16 pkey; | 1267 | u16 pkey; |
1268 | int ret; | 1268 | int ret; |
1269 | u8 p; | 1269 | u8 p; |
@@ -1284,8 +1284,7 @@ static int cma_bind_loopback(struct rdma_id_private *id_priv) | |||
1284 | } | 1284 | } |
1285 | 1285 | ||
1286 | port_found: | 1286 | port_found: |
1287 | gid = ib_addr_get_sgid(&id_priv->id.route.addr.dev_addr); | 1287 | ret = ib_get_cached_gid(cma_dev->device, p, 0, &gid); |
1288 | ret = ib_get_cached_gid(cma_dev->device, p, 0, gid); | ||
1289 | if (ret) | 1288 | if (ret) |
1290 | goto out; | 1289 | goto out; |
1291 | 1290 | ||
@@ -1293,6 +1292,7 @@ port_found: | |||
1293 | if (ret) | 1292 | if (ret) |
1294 | goto out; | 1293 | goto out; |
1295 | 1294 | ||
1295 | ib_addr_set_sgid(&id_priv->id.route.addr.dev_addr, &gid); | ||
1296 | ib_addr_set_pkey(&id_priv->id.route.addr.dev_addr, pkey); | 1296 | ib_addr_set_pkey(&id_priv->id.route.addr.dev_addr, pkey); |
1297 | id_priv->id.port_num = p; | 1297 | id_priv->id.port_num = p; |
1298 | cma_attach_to_dev(id_priv, cma_dev); | 1298 | cma_attach_to_dev(id_priv, cma_dev); |
@@ -1339,6 +1339,7 @@ static int cma_resolve_loopback(struct rdma_id_private *id_priv) | |||
1339 | { | 1339 | { |
1340 | struct cma_work *work; | 1340 | struct cma_work *work; |
1341 | struct sockaddr_in *src_in, *dst_in; | 1341 | struct sockaddr_in *src_in, *dst_in; |
1342 | union ib_gid gid; | ||
1342 | int ret; | 1343 | int ret; |
1343 | 1344 | ||
1344 | work = kzalloc(sizeof *work, GFP_KERNEL); | 1345 | work = kzalloc(sizeof *work, GFP_KERNEL); |
@@ -1351,8 +1352,8 @@ static int cma_resolve_loopback(struct rdma_id_private *id_priv) | |||
1351 | goto err; | 1352 | goto err; |
1352 | } | 1353 | } |
1353 | 1354 | ||
1354 | ib_addr_set_dgid(&id_priv->id.route.addr.dev_addr, | 1355 | ib_addr_get_sgid(&id_priv->id.route.addr.dev_addr, &gid); |
1355 | ib_addr_get_sgid(&id_priv->id.route.addr.dev_addr)); | 1356 | ib_addr_set_dgid(&id_priv->id.route.addr.dev_addr, &gid); |
1356 | 1357 | ||
1357 | if (cma_zero_addr(&id_priv->id.route.addr.src_addr)) { | 1358 | if (cma_zero_addr(&id_priv->id.route.addr.src_addr)) { |
1358 | src_in = (struct sockaddr_in *)&id_priv->id.route.addr.src_addr; | 1359 | src_in = (struct sockaddr_in *)&id_priv->id.route.addr.src_addr; |