PD#87694:not send hang event when scan timeout, open multicastDNS packet filter

diff --git a/broadcm_40181/dhd_config.c b/broadcm_40181/dhd_config.c
index 53171b4a291e247b94c172ec4b87809a8dbaad35..420fbe7f6add5cb83e367cebf225ecda4da41d7c 100755 (executable)
--- a/broadcm_40181/dhd_config.c
+++ b/broadcm_40181/dhd_config.c
@@ -1015,7 +1015,8 @@ dhd_conf_wifi_power(bool on)
 #endif\r
                if(wl_android_wifi_on(g_netdev) < 0) {\r
             /* wifi on failed, send HANG message to tell wpa_supplicant to restart wifi*/\r
-            net_os_send_hang_message(g_netdev);\r
+            if(g_netdev)\r
+                net_os_send_hang_message(g_netdev);\r
                }\r
         else {\r
 #ifdef WL_CFG80211\r

diff --git a/broadcm_40181/dhd_linux.c b/broadcm_40181/dhd_linux.c
index 5fb46d6f673cc0709b74b0ff7cc9e2eea9c30da1..96902b0be9b9d980781a2a792f98659a9fdf0bf7 100755 (executable)
--- a/broadcm_40181/dhd_linux.c
+++ b/broadcm_40181/dhd_linux.c
@@ -4206,7 +4206,7 @@ dhd_preinit_ioctls(dhd_pub_t *dhd)
                dhd->pktfilter[DHD_MULTICAST4_FILTER_NUM] = NULL;
                dhd->pktfilter[DHD_MULTICAST6_FILTER_NUM] = NULL;
                /* Add filter to pass multicastDNS packet and NOT filter out as Broadcast */
-               dhd->pktfilter[DHD_MDNS_FILTER_NUM] = NULL;//"104 0 0 0 0xFFFFFFFFFFFF 0x01005E0000FB";
+               dhd->pktfilter[DHD_MDNS_FILTER_NUM] = "104 0 0 0 0xFFFFFFFFFFFF 0x01005E0000FB";
                /* apply APP pktfilter */
                dhd->pktfilter[DHD_ARP_FILTER_NUM] = "105 0 0 12 0xFFFF 0x0806";
        }

diff --git a/broadcm_40181/wl_cfg80211.c b/broadcm_40181/wl_cfg80211.c
index bdd4a94b87263bfaf8e9dc93bb60a19e7539beeb..9b8e3f75eeb905dfa93913923bffc12ef9de3209 100755 (executable)
--- a/broadcm_40181/wl_cfg80211.c
+++ b/broadcm_40181/wl_cfg80211.c
@@ -9119,8 +9119,8 @@ static void wl_scan_timeout(unsigned long data)
                wl_notify_iscan_complete(wl_to_iscan(wl), true);
        }
        // terence 20130729: work around to fix out of memory in firmware
-       WL_ERR(("Send hang event\n"));
-       net_os_send_hang_message(ndev);
+       //WL_ERR(("Send hang event\n"));
+       //net_os_send_hang_message(ndev);
 }
 
 static void wl_iscan_timer(unsigned long data)
@@ -9454,7 +9454,7 @@ static s32 wl_escan_handler(struct wl_priv *wl, bcm_struct_cfgdev *cfgdev,
                                        goto exit;
                                if ((p2p_ie = wl_cfgp2p_find_p2pie(((u8 *) bi) + bi->ie_offset,
                                        bi->ie_length)) == NULL) {
-                                               WL_ERR(("Couldn't find P2PIE in probe"
+                                               WL_SCAN(("Couldn't find P2PIE in probe"
                                                        " response/beacon\n"));
                                                goto exit;
                                }