From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: [PATCH -next] infiniband: fix ipoib build error when IPOIB_CM is not enabled Date: Wed, 03 Oct 2012 14:50:41 -0700 Message-ID: <506CB331.8000101@xenotime.net> References: <20121003173007.c322d79c31676b9494a6bfd5@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20121003173007.c322d79c31676b9494a6bfd5-3FnU+UHB4dNDw9hX6IcOSA@public.gmane.org> Sender: linux-rdma-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Stephen Rothwell Cc: linux-next-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, LKML , Roland Dreier , Sean Hefty , Hal Rosenstock , linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Andrew Morton List-Id: linux-next.vger.kernel.org From: Randy Dunlap Fix build error when INFINIBAND_IPOIB_CM is not enabled: ERROR: "ipoib_set_mode" [drivers/infiniband/ulp/ipoib/ib_ipoib.ko] undefined! Signed-off-by: Randy Dunlap Cc: Roland Dreier Cc: Sean Hefty Cc: Hal Rosenstock Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org --- drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 3 +++ 1 file changed, 3 insertions(+) --- linux-next-20121003.orig/drivers/infiniband/ulp/ipoib/ipoib_netlink.c +++ linux-next-20121003/drivers/infiniband/ulp/ipoib/ipoib_netlink.c @@ -30,6 +30,7 @@ * SOFTWARE. */ +#include #include #include #include @@ -71,11 +72,13 @@ static int ipoib_changelink(struct net_d if (data[IFLA_IPOIB_MODE]) { mode = nla_get_u16(data[IFLA_IPOIB_MODE]); +#if IS_ENABLED(CONFIG_INFINIBAND_IPOIB_CM) if (mode == IPOIB_MODE_DATAGRAM) ret = ipoib_set_mode(dev, "datagram\n"); else if (mode == IPOIB_MODE_CONNECTED) ret = ipoib_set_mode(dev, "connected\n"); else +#endif ret = -EINVAL; if (ret < 0) -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html