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

Commit 8ae5a8a2 authored by Roland Dreier's avatar Roland Dreier
Browse files

[IPoIB] don't compile debug code if debugging isn't enabled 



Don't build ipoib_mcast_iter_ functions if CONFIG_INFINIBAND_IPOIB_DEBUG
is not enabled -- their only callers will not be built either.

Also move the prototype for ipoib_open() to ipoib.h to fix a sparse warning.

Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 21a38489

drivers/infiniband/ulp/ipoib/ipoib.h

+3 −0
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ static inline void ipoib_put_ah(struct ipoib_ah *ah) 
	kref_put(&ah->ref, ipoib_free_ah);

}



int ipoib_open(struct net_device *dev);

int ipoib_add_pkey_attr(struct net_device *dev);



void ipoib_send(struct net_device *dev, struct sk_buff *skb,
@@ -267,6 +268,7 @@ int ipoib_mcast_stop_thread(struct net_device *dev, int flush); 
void ipoib_mcast_dev_down(struct net_device *dev);

void ipoib_mcast_dev_flush(struct net_device *dev);



#ifdef CONFIG_INFINIBAND_IPOIB_DEBUG

struct ipoib_mcast_iter *ipoib_mcast_iter_init(struct net_device *dev);

void ipoib_mcast_iter_free(struct ipoib_mcast_iter *iter);

int ipoib_mcast_iter_next(struct ipoib_mcast_iter *iter);
@@ -276,6 +278,7 @@ void ipoib_mcast_iter_read(struct ipoib_mcast_iter *iter, 
				  unsigned int *queuelen,

				  unsigned int *complete,

				  unsigned int *send_only);

#endif



int ipoib_mcast_attach(struct net_device *dev, u16 mlid,

		       union ib_gid *mgid);

drivers/infiniband/ulp/ipoib/ipoib_ib.c

+0 −1
Original line number Diff line number Diff line
@@ -636,7 +636,6 @@ void ipoib_ib_dev_cleanup(struct net_device *dev) 
 * Bug #2507. This implementation will probably be removed when the P_Key

 * change async notification is available.

 */

int ipoib_open(struct net_device *dev);



static void ipoib_pkey_dev_check_presence(struct net_device *dev)

{

drivers/infiniband/ulp/ipoib/ipoib_multicast.c

+4 −0
Original line number Diff line number Diff line
@@ -917,6 +917,8 @@ void ipoib_mcast_restart_task(void *dev_ptr) 
		ipoib_mcast_start_thread(dev);

}



#ifdef CONFIG_INFINIBAND_IPOIB_DEBUG



struct ipoib_mcast_iter *ipoib_mcast_iter_init(struct net_device *dev)

{

	struct ipoib_mcast_iter *iter;
@@ -989,3 +991,5 @@ void ipoib_mcast_iter_read(struct ipoib_mcast_iter *iter, 
	*complete  = iter->complete;

	*send_only = iter->send_only;

}



#endif /* CONFIG_INFINIBAND_IPOIB_DEBUG */