diff options
| author | Stefan Guendhoer <stefan@guendhoer.com> | 2016-02-20 15:57:11 +0100 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2016-08-26 20:53:38 +0200 |
| commit | 0b60b164a18ba50d49f98cff3a34cc62ab19f1ed (patch) | |
| tree | b9e96650c65aca9ae68ab69b97f1393684001191 | |
| parent | f41aeea32505d2299c7782f4294bf477065e2875 (diff) | |
fix invalid ipv6 reference on disabled ipv6
| -rw-r--r-- | drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_init.c | 5 | ||||
| -rw-r--r-- | drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_p2p_init.c | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_init.c b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_init.c index 047b8e191..b8df23cb7 100644 --- a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_init.c +++ b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_init.c @@ -2704,7 +2704,10 @@ void wlanHandleSystemSuspend(void) kalMemZero(g_aucBufIpAddr, sizeof(g_aucBufIpAddr)); - prParamNetAddrList->u4AddressCount = u4NumIPv4 + u4NumIPv6; + prParamNetAddrList->u4AddressCount = u4NumIPv4; +#ifdef CONFIG_IPV6 + prParamNetAddrList->u4AddressCount += u4NumIPv6; +#endif prParamNetAddrList->u2AddressType = PARAM_PROTOCOL_ID_TCP_IP; for (i = 0; i < u4NumIPv4; i++) { prParamNetAddr->u2AddressLength = sizeof(PARAM_NETWORK_ADDRESS_IP);//4;; diff --git a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_p2p_init.c b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_p2p_init.c index 1817d491b..a322128ac 100644 --- a/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_p2p_init.c +++ b/drivers/misc/mediatek/connectivity/conn_soc/drv_wlan/mt_wifi/wlan/os/linux/gl_p2p_init.c @@ -220,7 +220,10 @@ void p2pHandleSystemSuspend(void) kalMemZero(g_aucBufIpAddr, sizeof(g_aucBufIpAddr)); - prParamNetAddrList->u4AddressCount = u4NumIPv4 + u4NumIPv6; + prParamNetAddrList->u4AddressCount = u4NumIPv4; +#ifdef CONFIG_IPV6 + prParamNetAddrList->u4AddressCount += u4NumIPv6; +#endif prParamNetAddrList->u2AddressType = PARAM_PROTOCOL_ID_TCP_IP; for (i = 0; i < u4NumIPv4; i++) { prParamNetAddr->u2AddressLength = sizeof(PARAM_NETWORK_ADDRESS_IP);//4;; |