diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2018-10-08 09:48:31 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-10-08 09:48:36 +0200 |
| commit | 188de5dd80b2b7986e75821374efb67081049b6e (patch) | |
| tree | 545bbc0fdb58f30c0175128e3b5a9c00c89e2020 /drivers/net/wireless/rsi/rsi_common.h | |
| parent | 5207ca554bfcb5a32959eb12b6aff8f64384492c (diff) | |
| parent | abf1a08ff3237a27188ff8cc2904f2cea893af55 (diff) | |
| download | talos-obmc-linux-188de5dd80b2b7986e75821374efb67081049b6e.tar.gz talos-obmc-linux-188de5dd80b2b7986e75821374efb67081049b6e.zip | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merge net-next, which pulled in net, so I can merge a few more
patches that would otherwise conflict.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/rsi/rsi_common.h')
| -rw-r--r-- | drivers/net/wireless/rsi/rsi_common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/rsi/rsi_common.h b/drivers/net/wireless/rsi/rsi_common.h index d9ff3b8be86e..60f1f286b030 100644 --- a/drivers/net/wireless/rsi/rsi_common.h +++ b/drivers/net/wireless/rsi/rsi_common.h @@ -75,7 +75,6 @@ static inline int rsi_kill_thread(struct rsi_thread *handle) atomic_inc(&handle->thread_done); rsi_set_event(&handle->event); - wait_for_completion(&handle->completion); return kthread_stop(handle->task); } |
