From bbea4dc9419213e4918735418eae91b03ec9c78e Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Tue, 23 Apr 2013 12:53:13 +0200 Subject: [PATCH] --- yaml --- r: 369683 b: refs/heads/master c: 9a83f1ec670fa574ffbfa9fb1f3fdaa9c6be5974 h: refs/heads/master i: 369681: f432bdc9237ac1f9d27ba156ce3827f38305d55c 369679: 60e34300552e5ba0c24b2acedc0e1118661ffb70 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 319352ea76fb..92950e149730 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61730d4dfffc2cc9d3a49fad87633008105c18ba +refs/heads/master: 9a83f1ec670fa574ffbfa9fb1f3fdaa9c6be5974 diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c index 66cdc45add4e..b0591e3da49a 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c @@ -871,9 +871,10 @@ int brcmf_fws_macdesc_indicate(struct brcmf_fws_info *fws, u8 type, u8 *data) entry = &fws->desc.nodes[mac_handle & 0x1F]; if (type == BRCMF_FWS_TYPE_MACDESC_DEL) { brcmf_dbg(TRACE, "deleting mac %pM idx %d\n", addr, ifidx); - if (entry->occupied) + if (entry->occupied) { + brcmf_fws_mac_desc_cleanup(fws, entry, -1); brcmf_fws_clear_mac_descriptor(entry); - else + } else fws->stats.mac_update_failed++; return 0; }