diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-03-06 16:46:25 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-03-06 16:46:43 +0100 |
| commit | 41effc2a6c6548f1dc6b749f09c646d931c309a4 (patch) | |
| tree | d99a5da02df4e4ab06a251dcd3960c153cbfd037 /drivers/net/wireless/iwlwifi/dvm | |
| parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) | |
| parent | 2470b36e84a2e680d7a7e3809cbceae5bfae3606 (diff) | |
| download | op-kernel-dev-41effc2a6c6548f1dc6b749f09c646d931c309a4.zip op-kernel-dev-41effc2a6c6548f1dc6b749f09c646d931c309a4.tar.gz | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into HEAD
This is needed to resolve some conflicts that would otherwise
happen between wireless-next and the code here.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/dvm')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/sta.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/sta.c b/drivers/net/wireless/iwlwifi/dvm/sta.c index 94ef338..b775769 100644 --- a/drivers/net/wireless/iwlwifi/dvm/sta.c +++ b/drivers/net/wireless/iwlwifi/dvm/sta.c @@ -151,7 +151,7 @@ int iwl_send_add_sta(struct iwl_priv *priv, sta_id, sta->sta.addr, flags & CMD_ASYNC ? "a" : ""); if (!(flags & CMD_ASYNC)) { - cmd.flags |= CMD_WANT_SKB | CMD_WANT_HCMD; + cmd.flags |= CMD_WANT_SKB; might_sleep(); } |
