Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71d9c5f9 authored by Roland Dreier's avatar Roland Dreier
Browse files

IPoIB: Fix build with CONFIG_INFINIBAND_IPOIB_CM=n 



With the new netlink support in commit 862096a8 ("IB/ipoib: Add more
rtnl_link_ops callbacks") we need ipoib_set_mode() to be available even
if connected mode isn't built.  Move the function from ipoib_cm.c to
ipoib_main.c (and make a few CM-related macros available unconditonally).

This fixes the build error

    drivers/built-in.o: In function 'ipoib_changelink':
    ipoib_netlink.c:(.text+0x6a5fc9): undefined reference to 'ipoib_set_mode'
    ipoib_netlink.c:(.text+0x6a5fe3): undefined reference to 'ipoib_set_mode'

when CONFIG_INFINIBAND_IPOIB_CM isn't set.

Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Reported-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 7a9a2970

drivers/infiniband/ulp/ipoib/ipoib.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -535,14 +535,14 @@ void ipoib_drain_cq(struct net_device *dev); 
void ipoib_set_ethtool_ops(struct net_device *dev);

void ipoib_set_ethtool_ops(struct net_device *dev);

int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca);

int ipoib_set_dev_features(struct ipoib_dev_priv *priv, struct ib_device *hca);





#ifdef CONFIG_INFINIBAND_IPOIB_CM



#define IPOIB_FLAGS_RC		0x80

#define IPOIB_FLAGS_RC		0x80

#define IPOIB_FLAGS_UC		0x40

#define IPOIB_FLAGS_UC		0x40





/* We don't support UC connections at the moment */

/* We don't support UC connections at the moment */

#define IPOIB_CM_SUPPORTED(ha)   (ha[0] & (IPOIB_FLAGS_RC))

#define IPOIB_CM_SUPPORTED(ha)   (ha[0] & (IPOIB_FLAGS_RC))





#ifdef CONFIG_INFINIBAND_IPOIB_CM



extern int ipoib_max_conn_qp;

extern int ipoib_max_conn_qp;





static inline int ipoib_cm_admin_enabled(struct net_device *dev)

static inline int ipoib_cm_admin_enabled(struct net_device *dev)

drivers/infiniband/ulp/ipoib/ipoib_cm.c

+0 −31
Original line number Original line Diff line number Diff line
@@ -1448,37 +1448,6 @@ static ssize_t show_mode(struct device *d, struct device_attribute *attr, 
		return sprintf(buf, "datagram\n");

		return sprintf(buf, "datagram\n");

}

}





int ipoib_set_mode(struct net_device *dev, const char *buf)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);



	/* flush paths if we switch modes so that connections are restarted */

	if (IPOIB_CM_SUPPORTED(dev->dev_addr) && !strcmp(buf, "connected\n")) {

		set_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);

		ipoib_warn(priv, "enabling connected mode "

			   "will cause multicast packet drops\n");

		netdev_update_features(dev);

		rtnl_unlock();

		priv->tx_wr.send_flags &= ~IB_SEND_IP_CSUM;



		ipoib_flush_paths(dev);

		rtnl_lock();

		return 0;

	}



	if (!strcmp(buf, "datagram\n")) {

		clear_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);

		netdev_update_features(dev);

		dev_set_mtu(dev, min(priv->mcast_mtu, dev->mtu));

		rtnl_unlock();

		ipoib_flush_paths(dev);

		rtnl_lock();

		return 0;

	}



	return -EINVAL;

}



static ssize_t set_mode(struct device *d, struct device_attribute *attr,

static ssize_t set_mode(struct device *d, struct device_attribute *attr,

			const char *buf, size_t count)

			const char *buf, size_t count)

{

{

drivers/infiniband/ulp/ipoib/ipoib_main.c

+31 −0
Original line number Original line Diff line number Diff line
@@ -215,6 +215,37 @@ static int ipoib_change_mtu(struct net_device *dev, int new_mtu) 
	return 0;

	return 0;

}

}





int ipoib_set_mode(struct net_device *dev, const char *buf)

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);



	/* flush paths if we switch modes so that connections are restarted */

	if (IPOIB_CM_SUPPORTED(dev->dev_addr) && !strcmp(buf, "connected\n")) {

		set_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);

		ipoib_warn(priv, "enabling connected mode "

			   "will cause multicast packet drops\n");

		netdev_update_features(dev);

		rtnl_unlock();

		priv->tx_wr.send_flags &= ~IB_SEND_IP_CSUM;



		ipoib_flush_paths(dev);

		rtnl_lock();

		return 0;

	}



	if (!strcmp(buf, "datagram\n")) {

		clear_bit(IPOIB_FLAG_ADMIN_CM, &priv->flags);

		netdev_update_features(dev);

		dev_set_mtu(dev, min(priv->mcast_mtu, dev->mtu));

		rtnl_unlock();

		ipoib_flush_paths(dev);

		rtnl_lock();

		return 0;

	}



	return -EINVAL;

}



static struct ipoib_path *__path_find(struct net_device *dev, void *gid)

static struct ipoib_path *__path_find(struct net_device *dev, void *gid)

{

{

	struct ipoib_dev_priv *priv = netdev_priv(dev);

	struct ipoib_dev_priv *priv = netdev_priv(dev);