IB/ipoib: Fix undefined symbol (priv->cm) if ipoib_cm disabled
PATCH 1/1 IB/ipoib: Fix undefined symbol (priv->cm) if ipoib_cm disabled
Signed-off-by Hoang-Nam Nguyen <[email protected]>
--- drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/infiniband/ulp/ipoib/ipoib_main.c +2 -0
@@ -181,6 +181,7 @@ static int ipoib_change_mtu(struct net_device *dev, int new_mtu) {struct ipoib_dev_priv *priv =netdev_priv (dev); +#ifdef CONFIG_INFINIBAND_IPOIB_CM /* dev->mtu > 2K ==> connected mode */ if (ipoib_cm_admin_enabled (dev)) {if (new_mtu > priv->cm.max_cm_mtu)
@@ -193,6 +194,7 @@ static int ipoib_change_mtu(struct net_device *dev, int new_mtu) dev->mtu = new_mtu; return 0; } +#endif if (new_mtu >IPOIB_PACKET_SIZE -IPOIB_ENCAP_LEN )return -EINVAL ;
Signature · 1 line
1.5.2
Thanks a lot for pointing this out! I rolled the following into the offending patch in my tree instead (I preferred avoiding #ifdefs in .c files...)
drivers/infiniband/ulp/ipoib/ipoib.h +11 -0
@@ -505,6 +505,12 @@ static inline int ipoib_cm_has_srq(struct net_device *dev)return !!priv->cm.srq; } +static inline unsigned int ipoib_cm_max_mtu (struct net_device *dev) +{ +struct ipoib_dev_priv *priv =netdev_priv (dev); +return priv->cm.max_cm_mtu; +} +void ipoib_cm_send (struct net_device *dev,struct sk_buff *skb,struct ipoib_cm_tx *tx);int ipoib_cm_dev_open (struct net_device *dev);void ipoib_cm_dev_stop (struct net_device *dev);
@@ -554,6 +560,11 @@ static inline int ipoib_cm_has_srq(struct net_device *dev)return 0 ; } +static inline unsigned int ipoib_cm_max_mtu (struct net_device *dev) +{ +return 0 ; +} +static inline void ipoib_cm_send (struct net_device *dev,struct sk_buff *skb,struct ipoib_cm_tx *tx) {
drivers/infiniband/ulp/ipoib/ipoib_main.c +1 -1
@@ -183,7 +183,7 @@ static int ipoib_change_mtu(struct net_device *dev, int new_mtu)/* dev->mtu > 2K ==> connected mode */ if (ipoib_cm_admin_enabled (dev)) { -if (new_mtu > priv->cm.max_cm_mtu) +if (new_mtu >ipoib_cm_max_mtu (dev))return -EINVAL ;if (new_mtu > priv->mcast_mtu)