wifi: update bcmdhd.1.579.77.41.1.cn from ampak[3/3]

[GitHub/LineageOS/G12/android_hardware_amlogic_kernel-modules_dhd-driver.git] / bcmdhd.1.579.77.41.1.cn / wl_cfgp2p.c

diff --git a/bcmdhd.1.579.77.41.1.cn/wl_cfgp2p.c b/bcmdhd.1.579.77.41.1.cn/wl_cfgp2p.c
index 6d775f71636cbd1819a530c57a64e231783f3eea..69f7a050cd148fcd2fffff412172797873831103 100644 (file)
--- a/bcmdhd.1.579.77.41.1.cn/wl_cfgp2p.c
+++ b/bcmdhd.1.579.77.41.1.cn/wl_cfgp2p.c
@@ -334,6 +334,9 @@ wl_cfgp2p_init_priv(struct bcm_cfg80211 *cfg)
                return -ENOMEM;
        }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+       cfg->p2p->cfg = cfg;
+#endif
        wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_PRIMARY) = bcmcfg_to_prmry_ndev(cfg);
        wl_to_p2p_bss_bssidx(cfg, P2PAPI_BSSCFG_PRIMARY) = 0;
        wl_to_p2p_bss_ndev(cfg, P2PAPI_BSSCFG_DEVICE) = NULL;
@@ -1386,10 +1389,21 @@ wl_cfgp2p_listen_complete(struct bcm_cfg80211 *cfg, bcm_struct_cfgdev *cfgdev,
  *  so lets do it from thread context.
  */
 void
-wl_cfgp2p_listen_expired(unsigned long data)
+wl_cfgp2p_listen_expired(
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+       struct timer_list *t
+#else
+       ulong data
+#endif
+)
 {
        wl_event_msg_t msg;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+       struct p2p_info *p2p = from_timer(p2p, t, listen_timer);
+       struct bcm_cfg80211 *cfg = p2p->cfg;
+#else
        struct bcm_cfg80211 *cfg = (struct bcm_cfg80211 *) data;
+#endif
        struct net_device *ndev;
        CFGP2P_DBG((" Enter\n"));