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

Commit 0e5544d9 authored by Erez Shitrit's avatar Erez Shitrit Committed by Doug Ledford
Browse files

IB/ipoib: Remove IPOIB_MCAST_RUN bit 



After Doug Ledford's changes there is no need in that bit, it's
semantic becomes subset of the IPOIB_FLAG_OPER_UP bit.

Signed-off-by: default avatarErez Shitrit <erezsh@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 1e85b806

drivers/infiniband/ulp/ipoib/ipoib.h

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ enum { 
	IPOIB_FLAG_ADMIN_UP	  = 2,

	IPOIB_PKEY_ASSIGNED	  = 3,

	IPOIB_FLAG_SUBINTERFACE	  = 5,

	IPOIB_MCAST_RUN		  = 6,

	IPOIB_STOP_REAPER	  = 7,

	IPOIB_FLAG_ADMIN_CM	  = 9,

	IPOIB_FLAG_UMCAST	  = 10,

drivers/infiniband/ulp/ipoib/ipoib_multicast.c

+2 −4
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static void __ipoib_mcast_schedule_join_thread(struct ipoib_dev_priv *priv, 
					       struct ipoib_mcast *mcast,

					       bool delay)

{

	if (!test_bit(IPOIB_MCAST_RUN, &priv->flags))

	if (!test_bit(IPOIB_FLAG_OPER_UP, &priv->flags))

		return;



	/*
@@ -519,7 +519,7 @@ void ipoib_mcast_join_task(struct work_struct *work) 
	struct ipoib_mcast *mcast = NULL;

	int create = 1;



	if (!test_bit(IPOIB_MCAST_RUN, &priv->flags))

	if (!test_bit(IPOIB_FLAG_OPER_UP, &priv->flags))

		return;



	if (ib_query_port(priv->ca, priv->port, &port_attr) ||
@@ -629,7 +629,6 @@ int ipoib_mcast_start_thread(struct net_device *dev) 
	ipoib_dbg_mcast(priv, "starting multicast thread\n");



	spin_lock_irqsave(&priv->lock, flags);

	set_bit(IPOIB_MCAST_RUN, &priv->flags);

	__ipoib_mcast_schedule_join_thread(priv, NULL, 0);

	spin_unlock_irqrestore(&priv->lock, flags);
@@ -644,7 +643,6 @@ int ipoib_mcast_stop_thread(struct net_device *dev) 
	ipoib_dbg_mcast(priv, "stopping multicast thread\n");



	spin_lock_irqsave(&priv->lock, flags);

	clear_bit(IPOIB_MCAST_RUN, &priv->flags);

	cancel_delayed_work(&priv->mcast_task);

	spin_unlock_irqrestore(&priv->lock, flags);