diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-02-19 20:56:34 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-02-19 20:56:34 +0100 |
| commit | 0b7164458fc184455239ea3676af1b362df1ce1d (patch) | |
| tree | 6b968c6ec46e7a949e930de85f75afc337128b97 /drivers/net/wireless/mwifiex/11n.c | |
| parent | ppp: set qdisc_tx_busylock to avoid LOCKDEP splat (diff) | |
| parent | net: wireless: hostap: hostap_ap.c: Return -ENOMEM instead of -1 for if kmall... (diff) | |
| download | linux-0b7164458fc184455239ea3676af1b362df1ce1d.tar.xz linux-0b7164458fc184455239ea3676af1b362df1ce1d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/mwifiex/11n.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/11n.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c index 25596ab0c576..45f19716687e 100644 --- a/drivers/net/wireless/mwifiex/11n.c +++ b/drivers/net/wireless/mwifiex/11n.c @@ -250,7 +250,8 @@ int mwifiex_cmd_amsdu_aggr_ctrl(struct host_cmd_ds_command *cmd, * - Setting HT Tx capability and HT Tx information fields * - Ensuring correct endian-ness */ -int mwifiex_cmd_11n_cfg(struct host_cmd_ds_command *cmd, u16 cmd_action, +int mwifiex_cmd_11n_cfg(struct mwifiex_private *priv, + struct host_cmd_ds_command *cmd, u16 cmd_action, struct mwifiex_ds_11n_tx_cfg *txcfg) { struct host_cmd_ds_11n_cfg *htcfg = &cmd->params.htcfg; @@ -260,6 +261,10 @@ int mwifiex_cmd_11n_cfg(struct host_cmd_ds_command *cmd, u16 cmd_action, htcfg->action = cpu_to_le16(cmd_action); htcfg->ht_tx_cap = cpu_to_le16(txcfg->tx_htcap); htcfg->ht_tx_info = cpu_to_le16(txcfg->tx_htinfo); + + if (priv->adapter->is_hw_11ac_capable) + htcfg->misc_config = cpu_to_le16(txcfg->misc_config); + return 0; } |