| Message ID | 20171226173318.5076-1-colin.king@canonical.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | ac1181c60822292176ab96912208ec9f9819faf8 |
| Delegated to: | Kalle Valo |
| Headers | show |
On Tue 2017-12-26 17:33:18, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > 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> Hmm. So yes, it might be correct. OTOH, this change may also break something. So... how was it tested? Pavel > --- > drivers/net/wireless/ti/wl1251/main.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c > index 6d02c660b4ab..037defd10b91 100644 > --- 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(struct ieee80211_hw *hw, > 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; > }
Colin Ian King <colin.king@canonical.com> wrote: > From: Colin Ian King <colin.king@canonical.com> > > 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> Patch applied to wireless-drivers-next.git, thanks. ac1181c60822 wl1251: check return from call to wl1251_acx_arp_ip_filter
diff --git a/drivers/net/wireless/ti/wl1251/main.c b/drivers/net/wireless/ti/wl1251/main.c index 6d02c660b4ab..037defd10b91 100644 --- 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(struct ieee80211_hw *hw, 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; }