diff options
author | Eli Cohen <eli@mellanox.co.il> | 2008-07-15 02:48:50 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2008-07-15 02:48:50 -0400 |
commit | c03d4731b5b6de45b95a10bf1d510dde423d6757 (patch) | |
tree | c5635fc4061f716c4bc69228950fe3a44fcf7ab4 | |
parent | 70fe1796a5ebc5f955be39bba5c42eee9eb89e1f (diff) |
IPoIB: Remove unused IPOIB_MCAST_STARTED code
The IPOIB_MCAST_STARTED flag is not used at all since commit b3e2749b
("IPoIB: Don't drop multicast sends when they can be queued"), so
remove it.
Signed-off-by: Eli Cohen <eli@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib.h | 1 | ||||
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index bb19587c5eaf..66a897567ea9 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h | |||
@@ -89,7 +89,6 @@ enum { | |||
89 | IPOIB_FLAG_SUBINTERFACE = 5, | 89 | IPOIB_FLAG_SUBINTERFACE = 5, |
90 | IPOIB_MCAST_RUN = 6, | 90 | IPOIB_MCAST_RUN = 6, |
91 | IPOIB_STOP_REAPER = 7, | 91 | IPOIB_STOP_REAPER = 7, |
92 | IPOIB_MCAST_STARTED = 8, | ||
93 | IPOIB_FLAG_ADMIN_CM = 9, | 92 | IPOIB_FLAG_ADMIN_CM = 9, |
94 | IPOIB_FLAG_UMCAST = 10, | 93 | IPOIB_FLAG_UMCAST = 10, |
95 | IPOIB_FLAG_CSUM = 11, | 94 | IPOIB_FLAG_CSUM = 11, |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index 4a6538b9301a..0b7d129161e1 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c | |||
@@ -592,10 +592,6 @@ int ipoib_mcast_start_thread(struct net_device *dev) | |||
592 | queue_delayed_work(ipoib_workqueue, &priv->mcast_task, 0); | 592 | queue_delayed_work(ipoib_workqueue, &priv->mcast_task, 0); |
593 | mutex_unlock(&mcast_mutex); | 593 | mutex_unlock(&mcast_mutex); |
594 | 594 | ||
595 | spin_lock_irq(&priv->lock); | ||
596 | set_bit(IPOIB_MCAST_STARTED, &priv->flags); | ||
597 | spin_unlock_irq(&priv->lock); | ||
598 | |||
599 | return 0; | 595 | return 0; |
600 | } | 596 | } |
601 | 597 | ||
@@ -605,10 +601,6 @@ int ipoib_mcast_stop_thread(struct net_device *dev, int flush) | |||
605 | 601 | ||
606 | ipoib_dbg_mcast(priv, "stopping multicast thread\n"); | 602 | ipoib_dbg_mcast(priv, "stopping multicast thread\n"); |
607 | 603 | ||
608 | spin_lock_irq(&priv->lock); | ||
609 | clear_bit(IPOIB_MCAST_STARTED, &priv->flags); | ||
610 | spin_unlock_irq(&priv->lock); | ||
611 | |||
612 | mutex_lock(&mcast_mutex); | 604 | mutex_lock(&mcast_mutex); |
613 | clear_bit(IPOIB_MCAST_RUN, &priv->flags); | 605 | clear_bit(IPOIB_MCAST_RUN, &priv->flags); |
614 | cancel_delayed_work(&priv->mcast_task); | 606 | cancel_delayed_work(&priv->mcast_task); |