diff options
| author | Roland Dreier <roland@purestorage.com> | 2015-01-31 02:39:20 +0300 |
|---|---|---|
| committer | Roland Dreier <roland@purestorage.com> | 2015-01-31 02:39:20 +0300 |
| commit | e7a623d2df28a477efb6cf60471a4e2225e2e8e4 (patch) | |
| tree | 6f1b66ba26913ccaba9b94537ee4934e5d9fce27 /drivers/infiniband/ulp/ipoib/ipoib.h | |
| parent | 962121b4fcd3e022c276104aec50b56d7ed1f71b (diff) | |
| download | linux-e7a623d2df28a477efb6cf60471a4e2225e2e8e4.tar.xz | |
Revert "IPoIB: fix MCAST_FLAG_BUSY usage"
This reverts commit 016d9fb25cd9817ea9c723f4f7ecd978636b4489.
The series of IPoIB bug fixes that went into 3.19-rc1 introduce
regressions, and after trying to sort things out, we decided to revert
to 3.18's IPoIB driver and get things right for 3.20.
Signed-off-by: Roland Dreier <roland@purestorage.com>
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib.h')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index f4c1b20b23b2..d7562beb5423 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h @@ -98,15 +98,9 @@ enum { IPOIB_MCAST_FLAG_FOUND = 0, /* used in set_multicast_list */ IPOIB_MCAST_FLAG_SENDONLY = 1, - /* - * For IPOIB_MCAST_FLAG_BUSY - * When set, in flight join and mcast->mc is unreliable - * When clear and mcast->mc IS_ERR_OR_NULL, need to restart or - * haven't started yet - * When clear and mcast->mc is valid pointer, join was successful - */ - IPOIB_MCAST_FLAG_BUSY = 2, + IPOIB_MCAST_FLAG_BUSY = 2, /* joining or already joined */ IPOIB_MCAST_FLAG_ATTACHED = 3, + IPOIB_MCAST_JOIN_STARTED = 4, MAX_SEND_CQE = 16, IPOIB_CM_COPYBREAK = 256, |