From 345a79554310ea5723d49b66b3f3979c9967c7e9 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Thu, 18 Oct 2012 15:44:27 +0000 Subject: [PATCH] Take advantage of if_baudrate_pf and calculate an effective baud rate on all platforms (not just amd64) to compute an equivalent IB rate. --- sys/ofed/include/rdma/ib_addr.h | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/sys/ofed/include/rdma/ib_addr.h b/sys/ofed/include/rdma/ib_addr.h index 0783abe4c86f..6a3790f2b003 100644 --- a/sys/ofed/include/rdma/ib_addr.h +++ b/sys/ofed/include/rdma/ib_addr.h @@ -247,17 +247,21 @@ 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)) + uintmax_t baudrate; + int exp; + + baudrate = dev->if_baudrate; + for (exp = dev->if_baudrate_pf; exp > 0; exp--) + baudrate *= 10; + if (baudrate >= IF_Gbps(40)) return IB_RATE_40_GBPS; - else if (dev->if_baudrate >= IF_Gbps(30ULL)) + else if (baudrate >= IF_Gbps(30)) return IB_RATE_30_GBPS; - else if (dev->if_baudrate >= IF_Gbps(20ULL)) + else if (baudrate >= IF_Gbps(20)) return IB_RATE_20_GBPS; - else if (dev->if_baudrate >= IF_Gbps(10ULL)) + else if (baudrate >= IF_Gbps(10)) return IB_RATE_10_GBPS; else -#endif return IB_RATE_PORT_CURRENT; } #endif