From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757025AbYDSTld (ORCPT ); Sat, 19 Apr 2008 15:41:33 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752964AbYDSTlX (ORCPT ); Sat, 19 Apr 2008 15:41:23 -0400 Received: from atrey.karlin.mff.cuni.cz ([195.113.31.123]:47338 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752551AbYDSTlW (ORCPT ); Sat, 19 Apr 2008 15:41:22 -0400 Date: Sat, 19 Apr 2008 21:42:06 +0200 From: Pavel Machek To: kernel list , kaszak@gmail.com, lcostantino@gmail.com, linux-wireless@vger.kernel.org Subject: w35und: one more unneccessary function Message-ID: <20080419194206.GA17558@elf.ucw.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Warning: Reading this can be dangerous to your mental health. User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove one more unnecessary function. --- commit 8cf2b466620bd533acf20596be1fabfc0b46d992 tree e0bf7b039e545bede22980048669557fc49490e4 parent 6627ff26a459db3e792ec4dc194122c133c150a5 author Pavel Sat, 19 Apr 2008 21:41:31 +0200 committer Pavel Sat, 19 Apr 2008 21:41:31 +0200 .../net/wireless/winbond/winbondport/mlmetxrx.c | 57 ----------------------- 1 files changed, 0 insertions(+), 57 deletions(-) diff --git a/drivers/net/wireless/winbond/winbondport/mlmetxrx.c b/drivers/net/wireless/winbond/winbondport/mlmetxrx.c index dcfdfd4..f58e458 100644 --- a/drivers/net/wireless/winbond/winbondport/mlmetxrx.c +++ b/drivers/net/wireless/winbond/winbondport/mlmetxrx.c @@ -298,62 +298,5 @@ MLMERcvFrame( #endif return; } -#ifdef _IBSS_BEACON_SEQ_STICK_ -s8 SendBCNullData(PWB32_ADAPTER Adapter, u16 wIdx) -{ - - PUCHAR msg; - struct Data_Frame* msgHeader; - - if ((msg=MLMEGetMMPDUBuffer(Adapter))==NULL) - { - Adapter->sMlmeFrame.wNumTxMMPDUDiscarded++; - return -1; // fail get free msg buffer - } - //wConnectIdx = psLOCAL->wConnectedSTAindex; - msgHeader = (struct Data_Frame *) &msg[0]; - - // setup Frame-Header subfields - msgHeader->frame_control.mac_frame_info = MAC_SUBTYPE_DATA_NULL; - if (psBSS(wIdx)->bBssType == ESS_NET) - msgHeader->frame_control.to_ds = 1; - else - msgHeader->frame_control.to_ds = 0; - msgHeader->frame_control.from_ds = 0; - msgHeader->frame_control.more_frag = 0; - msgHeader->frame_control.retry = 0; - msgHeader->frame_control.more_data = 0; - msgHeader->frame_control.order = 0; - //if (PowerMode == PWR_SAVE) - // msgHeader->frame_control.pwr_mgt = 1; - //else - msgHeader->frame_control.pwr_mgt = 0; - msgHeader->frame_control.WEP = 0; - msgHeader->duration = 0; // Set by the MDS - - //memcpy(msgHeader->Addr1, psBSS(Adapter->sLocalPara.wConnectedSTAindex)->abBssID,MAC_ADDR_LENGTH); - memcpy( msgHeader->Addr1, "\xff\xff\xff\xff\xff\xff", MAC_ADDR_LENGTH ); - //memset(msgHeader->Addr1, 0x55, MAC_ADDR_LENGTH); - memcpy( msgHeader->Addr2, Adapter->sLocalPara.ThisMacAddress, MAC_ADDR_LENGTH ); - memcpy( msgHeader->Addr3, psBSS(wIdx)->abBssID, MAC_ADDR_LENGTH ); - // FrameSequenceNumber is generated by HW-MAC - - OS_MEMORY_CLEAR( &msgHeader->Sequence_Control, MAC_ADDR_LENGTH ); - - // now send this message out - if (1 == MLMESendFrame( Adapter, - (u8 *) &msg[0], - //sizeof(struct Data_Frame) - 6, - sizeof(struct Data_Frame), - FRAME_TYPE_802_11_DATA)) - return 1; // Has sent to the Tx handler. - else - { - //return MLME buffer - MLMEfreeMMPDUBuffer(Adapter, msg); - return -1; - } -} -#endif -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html