diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2010-03-22 16:30:45 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2010-03-22 16:30:45 -0700 |
| commit | 8bfad70954726e970a7cd7842eaf7a4f6712fe27 (patch) | |
| tree | ec25bda4ff22a0238dca5c0d891e62fc5f4388c4 | |
| parent | 7f1cade2dc020d523af5047ea19db6db29878f18 (diff) | |
| download | wlan-8bfad70954726e970a7cd7842eaf7a4f6712fe27.tar.gz | |
wl1271: Adjust scanCncn_MlmeResultCB() pSsid == NULL processing
Change-Id: I40b6cf61d7caf8dafdd99d9d21379989319df560
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
| -rw-r--r-- | wl1271/stad/src/Sta_Management/ScanCncn.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/wl1271/stad/src/Sta_Management/ScanCncn.c b/wl1271/stad/src/Sta_Management/ScanCncn.c index ff8910c..1081652 100644 --- a/wl1271/stad/src/Sta_Management/ScanCncn.c +++ b/wl1271/stad/src/Sta_Management/ScanCncn.c @@ -729,17 +729,23 @@ void scanCncn_MlmeResultCB (TI_HANDLE hScanCncn, TMacAddr* bssid, mlmeFrameInfo_ { TRACE6(pScanCncn->hReport, REPORT_SEVERITY_INFORMATION , "scanCncn_MlmeResultCB: received frame from BBSID: %02x:%02x:%02x:%02x:%02x:%02x\n", (*bssid)[ 0 ], (*bssid)[ 1 ], (*bssid)[ 2 ], (*bssid)[ 3 ], (*bssid)[ 4 ], (*bssid)[ 5 ]); + /* If SSID IE is missing, discard the frame */ + if (frameInfo->content.iePacket.pSsid == NULL) + { + TRACE6(pScanCncn->hReport, REPORT_SEVERITY_INFORMATION , "scanCncn_MlmeResultCB: discarding frame from BSSID: %02x:%02x:%02x:%02x:%02x:%02x, because SSID IE is missing!!\n", (*bssid)[ 0 ], (*bssid)[ 1 ], (*bssid)[ 2 ], (*bssid)[ 3 ], (*bssid)[ 4 ], (*bssid)[ 5 ]); + bValidResult = TI_FALSE; + } + /* If SSID length is 0 (hidden SSID), discard the frame */ - if ((frameInfo->content.iePacket.pSsid == NULL) || - (frameInfo->content.iePacket.pSsid->hdr[1] == 0)) + else if (frameInfo->content.iePacket.pSsid->hdr[1] == 0) { /*Unless it is application scan for any SSID - In this case we want to see also the hidden SSIDs*/ if (!(((SCAN_SCC_APP_ONE_SHOT == eClient) || (SCAN_SCC_APP_PERIODIC == eClient)) && pScanCncn->pScanClients[ eClient ]->uScanParams.tOneShotScanParams.desiredSsid.len == 0)) - { - TRACE6(pScanCncn->hReport, REPORT_SEVERITY_INFORMATION , "scanCncn_MlmeResultCB: discarding frame from BSSID: %02x:%02x:%02x:%02x:%02x:%02x, because SSID is hidden (len=0)\n", (*bssid)[ 0 ], (*bssid)[ 1 ], (*bssid)[ 2 ], (*bssid)[ 3 ], (*bssid)[ 4 ], (*bssid)[ 5 ]); - bValidResult = TI_FALSE; - } + { + TRACE6(pScanCncn->hReport, REPORT_SEVERITY_INFORMATION , "scanCncn_MlmeResultCB: discarding frame from BSSID: %02x:%02x:%02x:%02x:%02x:%02x, because SSID is hidden (len=0)\n", (*bssid)[ 0 ], (*bssid)[ 1 ], (*bssid)[ 2 ], (*bssid)[ 3 ], (*bssid)[ 4 ], (*bssid)[ 5 ]); + bValidResult = TI_FALSE; + } } /* |