projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_next' into for_linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
dvm
/
sta.c
diff --git
a/drivers/net/wireless/iwlwifi/dvm/sta.c
b/drivers/net/wireless/iwlwifi/dvm/sta.c
index 94ef33838bc69b615f8f47140922bf0d13eb2453..b775769f8322c437558712af955332296e95db89 100644
(file)
--- 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();
}