diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 10:36:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 10:36:48 -0700 |
| commit | a78b3371b628559eb5c46ee1518df27c62f3e801 (patch) | |
| tree | dd32333307ce6a7e4d39ea8c07c34bc3dc5540a1 /drivers/infiniband/ulp/ipoib/ipoib.h | |
| parent | 97c169a21bfb5bb2ab2bccd852da4f0d0e021c55 (diff) | |
| parent | a4d61e84804f3b14cc35c5e2af768a07c0f64ef6 (diff) | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib.h')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index 04c98f54e9c..bea960b8191 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h @@ -1,5 +1,7 @@ /* * Copyright (c) 2004, 2005 Topspin Communications. All rights reserved. + * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright (c) 2004 Voltaire, Inc. All rights reserved. * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -49,9 +51,9 @@ #include <asm/atomic.h> #include <asm/semaphore.h> -#include <ib_verbs.h> -#include <ib_pack.h> -#include <ib_sa.h> +#include <rdma/ib_verbs.h> +#include <rdma/ib_pack.h> +#include <rdma/ib_sa.h> /* constants */ @@ -88,8 +90,8 @@ enum { /* structs */ struct ipoib_header { - u16 proto; - u16 reserved; + __be16 proto; + u16 reserved; }; struct ipoib_pseudoheader { |