소스 검색

Staging: w35und: Kill _IBSS_BEACON_SEQ_STICK_

This patch kills the _IBSS_BEACON_SEQ_STICK_ ifdefs because the macro is never
defined.

Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Pekka Enberg 14 년 전
부모
커밋
37b0544a4a
2개의 변경된 파일0개의 추가작업 그리고 8개의 파일을 삭제
  1. 0 4
      drivers/staging/winbond/mlmetxrx_f.h
  2. 0 4
      drivers/staging/winbond/reg.c

+ 0 - 4
drivers/staging/winbond/mlmetxrx_f.h

@@ -16,8 +16,4 @@ void
 MLME_SendComplete(struct wbsoft_priv *adapter, u8 PacketID,
 		  unsigned char SendOK);
 
-#ifdef _IBSS_BEACON_SEQ_STICK_
-s8 SendBCNullData(struct wbsoft_priv *adapter, u16 wIdx);
-#endif
-
 #endif

+ 0 - 4
drivers/staging/winbond/reg.c

@@ -2064,11 +2064,7 @@ void Mxx_initial(struct hw_data *pHwData)
 	 */
 
 	/* M00 bit set */
-	#ifdef _IBSS_BEACON_SEQ_STICK_
-	reg->M00_MacControl = 0; /* Solve beacon sequence number stop by software */
-	#else
 	reg->M00_MacControl = 0x80000000; /* Solve beacon sequence number stop by hardware */
-	#endif
 
 	/* M24 disable enter power save, BB RxOn and enable NAV attack */
 	reg->M24_MacControl = 0x08040042;