diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-08 20:27:17 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-08 20:27:25 (GMT) |
| commit | 63f2cd32fb5f8541636f47cc4c7c53cf8284851f (patch) | |
| tree | d8e66fde55f70332fd495907d529996e9568038b /drivers/net/wireless/mwifiex/11n.c | |
| parent | 47d2261a3fa71cde24263559a4219a25e50d8c89 (diff) | |
| parent | 2acf1c25b979aaae983bfd7c0c4dd04b31ccfc01 (diff) | |
| download | linux-fsl-qoriq-63f2cd32fb5f8541636f47cc4c7c53cf8284851f.tar.xz | |
Merge remote-tracking branch 'stable/linux-3.12.y' into sdk-v1.6.x
Signed-off-by: Scott Wood <scottwood@freescale.com>
Conflicts:
drivers/mmc/card/block.c
Diffstat (limited to 'drivers/net/wireless/mwifiex/11n.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/11n.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/mwifiex/11n.c b/drivers/net/wireless/mwifiex/11n.c index 0b803c0..983c10c 100644 --- a/drivers/net/wireless/mwifiex/11n.c +++ b/drivers/net/wireless/mwifiex/11n.c @@ -308,8 +308,7 @@ mwifiex_cmd_append_11n_tlv(struct mwifiex_private *priv, ht_cap->header.len = cpu_to_le16(sizeof(struct ieee80211_ht_cap)); memcpy((u8 *) ht_cap + sizeof(struct mwifiex_ie_types_header), - (u8 *) bss_desc->bcn_ht_cap + - sizeof(struct ieee_types_header), + (u8 *)bss_desc->bcn_ht_cap, le16_to_cpu(ht_cap->header.len)); mwifiex_fill_cap_info(priv, radio_type, ht_cap); |