| From foo@baz Mon Apr 9 17:09:24 CEST 2018 |
| From: Colin Ian King <colin.king@canonical.com> |
| Date: Tue, 26 Dec 2017 17:33:18 +0000 |
| Subject: wl1251: check return from call to wl1251_acx_arp_ip_filter |
| |
| From: Colin Ian King <colin.king@canonical.com> |
| |
| |
| [ Upstream commit ac1181c60822292176ab96912208ec9f9819faf8 ] |
| |
| Currently the less than zero error check on ret is incorrect |
| as it is checking a far earlier ret assignment rather than the |
| return from the call to wl1251_acx_arp_ip_filter. Fix this by |
| adding in the missing assginment. |
| |
| Detected by CoverityScan, CID#1164835 ("Logically dead code") |
| |
| Fixes: 204cc5c44fb6 ("wl1251: implement hardware ARP filtering") |
| Signed-off-by: Colin Ian King <colin.king@canonical.com> |
| Signed-off-by: Kalle Valo <kvalo@codeaurora.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/wireless/ti/wl1251/main.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/drivers/net/wireless/ti/wl1251/main.c |
| +++ b/drivers/net/wireless/ti/wl1251/main.c |
| @@ -1200,8 +1200,7 @@ static void wl1251_op_bss_info_changed(s |
| WARN_ON(wl->bss_type != BSS_TYPE_STA_BSS); |
| |
| enable = bss_conf->arp_addr_cnt == 1 && bss_conf->assoc; |
| - wl1251_acx_arp_ip_filter(wl, enable, addr); |
| - |
| + ret = wl1251_acx_arp_ip_filter(wl, enable, addr); |
| if (ret < 0) |
| goto out_sleep; |
| } |
