diff --git a/[refs] b/[refs] index e279efebd105..427c542549ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5926b9ae320eadc22e33466b560f6ce1890f1780 +refs/heads/master: b7526f1460259dd6382135b46ced6dfd508efe5e diff --git a/trunk/drivers/staging/vt6656/iwctl.c b/trunk/drivers/staging/vt6656/iwctl.c index 384ce511e255..b4c405168d26 100644 --- a/trunk/drivers/staging/vt6656/iwctl.c +++ b/trunk/drivers/staging/vt6656/iwctl.c @@ -182,9 +182,7 @@ if(pDevice->byReAssocCount > 0) { //reject scan when re-associating! spin_lock_irq(&pDevice->lock); -#ifdef update_BssList BSSvClearBSSList((void *) pDevice, pDevice->bLinkPass); -#endif //mike add: active scan OR passive scan OR desire_ssid scan if(wrq->length == sizeof(struct iw_scan_req)) { diff --git a/trunk/drivers/staging/vt6656/ttype.h b/trunk/drivers/staging/vt6656/ttype.h index 38191745723a..5677e8044dd1 100644 --- a/trunk/drivers/staging/vt6656/ttype.h +++ b/trunk/drivers/staging/vt6656/ttype.h @@ -40,11 +40,6 @@ typedef int BOOL; #define FALSE 0 #endif -//2007-0809-01by MikeLiu -#ifndef update_BssList -#define update_BssList -#endif - #ifndef WPA_SM_Transtatus #define WPA_SM_Transtatus #endif