diff options
| author |   Michael S. Tsirkin <mst@mellanox.co.il> | 2006-02-20 21:50:39 -0800 |
|---|---|---|
| committer |   Roland Dreier <rolandd@cisco.com> | 2006-03-20 10:08:16 -0800 |
| commit | 44af79f9524c29d6850591cc972f2667a27234d4 (patch) | |
| tree | 8d88bdbd7c3fd015c692792bf1fcd3600ba0c275 /drivers/infiniband/ulp | |
| parent | IB/uverbs: Fix alignment of struct ib_uverbs_create_qp_resp (diff) | |
| download | linux-dev-44af79f9524c29d6850591cc972f2667a27234d4.tar.xz linux-dev-44af79f9524c29d6850591cc972f2667a27234d4.zip | |
IPoIB: clarify to_ipoib_neigh()
Cosmetic change: make alignment explicit in to_ipoib_neigh.
Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/ulp')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index 2f85a9a831b1..638eff745b2f 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h @@ -217,10 +217,16 @@ struct ipoib_neigh { struct list_head list; }; +/* + * We stash a pointer to our private neighbour information after our + * hardware address in neigh->ha. The ALIGN() expression here makes + * sure that this pointer is stored aligned so that an unaligned + * load is not needed to dereference it. + */ static inline struct ipoib_neigh **to_ipoib_neigh(struct neighbour *neigh) { - return (struct ipoib_neigh **) (neigh->ha + 24 - - (offsetof(struct neighbour, ha) & 4)); + return (void*) neigh + ALIGN(offsetof(struct neighbour, ha) + + INFINIBAND_ALEN, sizeof(void *)); } extern struct workqueue_struct *ipoib_workqueue; |