diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-24 10:31:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-24 10:31:34 +0200 |
| commit | e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30 (patch) | |
| tree | 77926550ac0c31b1423bcf193a4ed0ecb7fda2c1 /include/rdma | |
| parent | d4738792fb86600b6cb7220459d9c47e819b3580 (diff) | |
| parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
| download | op-kernel-dev-e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30.zip op-kernel-dev-e6aa0f07cb5e81a7cbeaf3be6e2101234c2f0d30.tar.gz | |
Merge commit 'v2.6.27-rc7' into x86/microcode
Diffstat (limited to 'include/rdma')
| -rw-r--r-- | include/rdma/rdma_cm.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/rdma/rdma_cm.h b/include/rdma/rdma_cm.h index df7faf0..c6b2962 100644 --- a/include/rdma/rdma_cm.h +++ b/include/rdma/rdma_cm.h @@ -71,12 +71,8 @@ enum rdma_port_space { }; struct rdma_addr { - struct sockaddr src_addr; - u8 src_pad[sizeof(struct sockaddr_in6) - - sizeof(struct sockaddr)]; - struct sockaddr dst_addr; - u8 dst_pad[sizeof(struct sockaddr_in6) - - sizeof(struct sockaddr)]; + struct sockaddr_storage src_addr; + struct sockaddr_storage dst_addr; struct rdma_dev_addr dev_addr; }; |
