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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
wireless
/
mwl8k.c
diff --git
a/drivers/net/wireless/mwl8k.c
b/drivers/net/wireless/mwl8k.c
index 68357641c4147367ac4d9bbf3e986b215165dcf1..224cf917744a7d9a1f9c02aea8f1dde473645b20 100644
(file)
--- a/
drivers/net/wireless/mwl8k.c
+++ b/
drivers/net/wireless/mwl8k.c
@@
-4333,9
+4333,11
@@
static int mwl8k_cmd_update_stadb_add(struct ieee80211_hw *hw,
p->amsdu_enabled = 0;
rc = mwl8k_post_cmd(hw, &cmd->header);
+ if (!rc)
+ rc = p->station_id;
kfree(cmd);
- return rc
? rc : p->station_id
;
+ return rc;
}
static int mwl8k_cmd_update_stadb_del(struct ieee80211_hw *hw,