diff --git a/[refs] b/[refs] index 58813df725f5..610a44c2822f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d426205d588e0fd7924c0fd76c012f6f8667cccc +refs/heads/master: 26cd230f0e7e1ddd1681752430d4d4c7b37d9b01 diff --git a/trunk/drivers/staging/bcm/Adapter.h b/trunk/drivers/staging/bcm/Adapter.h index acf7add55cec..95652cbec2bd 100644 --- a/trunk/drivers/staging/bcm/Adapter.h +++ b/trunk/drivers/staging/bcm/Adapter.h @@ -244,7 +244,7 @@ typedef struct _PER_TARANG_DATA { struct _MINI_ADAPTER *Adapter; struct sk_buff *RxAppControlHead; struct sk_buff *RxAppControlTail; - volatile int AppCtrlQueueLen; + int AppCtrlQueueLen; BOOLEAN MacTracingEnabled; BOOLEAN bApplicationToExit; S_MIBS_DROPPED_APP_CNTRL_MESSAGES stDroppedAppCntrlMsgs; @@ -351,7 +351,7 @@ struct _MINI_ADAPTER { u32 msg_enable; CHAR *caDsxReqResp; atomic_t ApplicationRunning; - volatile int CtrlQueueLen; + int CtrlQueueLen; atomic_t AppCtrlQueueLen; BOOLEAN AppCtrlQueueOverFlow; atomic_t CurrentApplicationCount;