From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 20 Jul 2012 16:30:48 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
---

90b90f60c4f8e3a8525dfeb4aec46a9c7a29c857
diff --cc drivers/net/wireless/mwifiex/sta_cmdresp.c
index 97715dfbdf58,e0178c0829d7..0b09004ebb25
--- a/drivers/net/wireless/mwifiex/sta_cmdresp.c
+++ b/drivers/net/wireless/mwifiex/sta_cmdresp.c
@@@ -280,9 -278,8 +278,8 @@@ static int mwifiex_ret_tx_rate_cfg(stru
  	u16 tlv, tlv_buf_len;
  	u8 *tlv_buf;
  	u32 i;
- 	int ret = 0;
  
 -	tlv_buf = (u8 *) ((u8 *) rate_cfg) +
 +	tlv_buf = ((u8 *)rate_cfg) +
  			sizeof(struct host_cmd_ds_tx_rate_cfg);
  	tlv_buf_len = *(u16 *) (tlv_buf + sizeof(u16));