net: rtl8192cu: Fix outstanding GCC 6.4.0 warnings

[mirror_ubuntu-bionic-kernel.git] / drivers / net / wireless / realtek / rtl8192cu / core / rtw_ap.c

diff --git a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ap.c b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ap.c
index 405e7feebc6ad96e7adf5ada1895c68fa2fd25e9..14576dd191f3d60cc2745ffd3a7fa7c39c565c22 100644 (file)
--- a/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ap.c
+++ b/drivers/net/wireless/realtek/rtl8192cu/core/rtw_ap.c
@@ -210,7 +210,7 @@ void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *d
        PNDIS_802_11_VARIABLE_IEs       pIE;
        u8      bmatch = _FALSE;
        u8      *pie = pnetwork->IEs;
-       u8      *p, *dst_ie, *premainder_ie=NULL, *pbackup_remainder_ie=NULL;
+       u8      *p=NULL, *dst_ie=NULL, *premainder_ie=NULL, *pbackup_remainder_ie=NULL;
        u32     i, offset, ielen, ie_offset, remainder_ielen = 0;
 
        for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pnetwork->IELength;)
@@ -250,6 +250,9 @@ void rtw_add_bcn_ie(_adapter *padapter, WLAN_BSSID_EX *pnetwork, u8 index, u8 *d
                        dst_ie = (p+ielen);
        }
 
+       if(dst_ie == NULL)
+               return;
+
        if(remainder_ielen>0)
        {
                pbackup_remainder_ie = rtw_malloc(remainder_ielen);
@@ -357,7 +360,7 @@ void        expire_timeout_chk(_adapter *padapter)
 {
        _irqL irqL;
        _list   *phead, *plist;
-       u8 updated;
+       u8 updated = _FALSE;
        struct sta_info *psta=NULL;     
        struct sta_priv *pstapriv = &padapter->stapriv;
        u8 chk_alive_num = 0;