staging: wilc1000: handle mgmt frames for both interfaces during concurrent mode

During concurrent mode(AP/STA + P2P), pass the mgmt frames received from
firmware to appropriate interface. Iterate the complete interface list
to pass frames on the interface which has registered to receive mgmt
frame. Added extra time for 'remain_on_ch' timer to ensure that timeout
for uncanceled remain_on_channel is not triggered & 'p2p_listen_state'
is not cleared before passing the mgmt frames to p2p interface.

Signed-off-by: Ajay Singh <ajay.kathat@microchip.com>
Link: https://lore.kernel.org/r/20191018124511.22751-1-ajay.kathat@microchip.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wilc1000/wilc_netdev.c b/drivers/staging/wilc1000/wilc_netdev.c
index 93c0d6e78813081d850f7e3232b3f5a1b1d95e39..2bc7e5427fa89e58294e1d65494d6512f45cd246 100644 (file)
--- a/drivers/staging/wilc1000/wilc_netdev.c
+++ b/drivers/staging/wilc1000/wilc_netdev.c
@@ -817,16 +817,13 @@ void wilc_wfi_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size)
        list_for_each_entry_rcu(vif, &wilc->vif_list, list) {
                u16 type = le16_to_cpup((__le16 *)buff);
 
-               if ((type == vif->frame_reg[0].type && vif->frame_reg[0].reg) ||
-                   (type == vif->frame_reg[1].type && vif->frame_reg[1].reg)) {
+               if (vif->priv.p2p_listen_state &&
+                   ((type == vif->frame_reg[0].type && vif->frame_reg[0].reg) ||
+                    (type == vif->frame_reg[1].type && vif->frame_reg[1].reg)))
                        wilc_wfi_p2p_rx(vif, buff, size);
-                       break;
-               }
 
-               if (vif->monitor_flag) {
+               if (vif->monitor_flag)
                        wilc_wfi_monitor_rx(wilc->monitor_dev, buff, size);
-                       break;
-               }
        }
        srcu_read_unlock(&wilc->srcu, srcu_idx);
 }

diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 6422f6f5eadbfdb95b839f462a21460f65d25868..9781f712ae3ea177b8b919c3bbdd2dd18b3b0dbf 100644 (file)
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1138,7 +1138,7 @@ static int remain_on_channel(struct wiphy *wiphy,
 
        cfg80211_ready_on_channel(wdev, *cookie, chan, duration, GFP_KERNEL);
        mod_timer(&vif->hif_drv->remain_on_ch_timer,
-                 jiffies + msecs_to_jiffies(duration));
+                 jiffies + msecs_to_jiffies(duration + 1000));
 
        return ret;
 }