diff options
| author | Konstantin Belousov <kib@FreeBSD.org> | 2011-03-21 21:16:40 +0000 |
|---|---|---|
| committer | Konstantin Belousov <kib@FreeBSD.org> | 2011-03-21 21:16:40 +0000 |
| commit | f394ce6e5bf976f4449596ad943b045a86cd3690 (patch) | |
| tree | e047fe781b5f4a4efc560d9b45751246fc766160 /sys/ofed/include | |
| parent | dbe63d3a2758953cd85c21c566cc528e38215d99 (diff) | |
Notes
Diffstat (limited to 'sys/ofed/include')
| -rw-r--r-- | sys/ofed/include/linux/gfp.h | 3 | ||||
| -rw-r--r-- | sys/ofed/include/linux/scatterlist.h | 2 | ||||
| -rw-r--r-- | sys/ofed/include/rdma/ib_addr.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/sys/ofed/include/linux/gfp.h b/sys/ofed/include/linux/gfp.h index 7f8a24ff7222..661ff41ab248 100644 --- a/sys/ofed/include/linux/gfp.h +++ b/sys/ofed/include/linux/gfp.h @@ -56,7 +56,8 @@ page_address(struct page *page) if (page->object != kmem_object && page->object != kernel_object) return (NULL); - return (void *)(VM_MIN_KERNEL_ADDRESS + IDX_TO_OFF(page->pindex)); + return ((void *)(uintptr_t)(VM_MIN_KERNEL_ADDRESS + + IDX_TO_OFF(page->pindex))); } static inline unsigned long diff --git a/sys/ofed/include/linux/scatterlist.h b/sys/ofed/include/linux/scatterlist.h index 611ad565915b..49dc31def1af 100644 --- a/sys/ofed/include/linux/scatterlist.h +++ b/sys/ofed/include/linux/scatterlist.h @@ -36,7 +36,7 @@ struct scatterlist { struct page *page; struct scatterlist *sg; } sl_un; - unsigned long address; + dma_addr_t address; unsigned long offset; uint32_t length; uint32_t flags; diff --git a/sys/ofed/include/rdma/ib_addr.h b/sys/ofed/include/rdma/ib_addr.h index 61b0a7cf1e91..0783abe4c86f 100644 --- a/sys/ofed/include/rdma/ib_addr.h +++ b/sys/ofed/include/rdma/ib_addr.h @@ -247,6 +247,7 @@ static inline int iboe_get_rate(struct net_device *dev) #else static inline int iboe_get_rate(struct net_device *dev) { +#ifdef __amd64__ if (dev->if_baudrate >= IF_Gbps(40ULL)) return IB_RATE_40_GBPS; else if (dev->if_baudrate >= IF_Gbps(30ULL)) @@ -256,6 +257,7 @@ static inline int iboe_get_rate(struct net_device *dev) else if (dev->if_baudrate >= IF_Gbps(10ULL)) return IB_RATE_10_GBPS; else +#endif return IB_RATE_PORT_CURRENT; } #endif |