dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

Staging: rt28x0: remove support for private driver parameters

Browse source 
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2009-10-21 22:44:27 +02:00 committed by Greg Kroah-Hartman
parent 4c96e89320
commit 782f111125
5 changed files with 0 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/rt2860/Makefile
View file

@ -38,7 +38,6 @@ rt2860sta-objs := \
sta/connect.o \
sta/wpa.o \
rt_linux.o \
rt_profile.o \
rt_main_dev.o \
sta_ioctl.o \
common/ba_action.o \

9
drivers/staging/rt2860/common/rtmp_init.c
View file

@ -3439,16 +3439,7 @@ int rt28xx_init(
goto err3;
}
// Read parameters from Config File
Status = RTMPReadParametersHook(pAd);
DBGPRINT(RT_DEBUG_OFF, ("1. Phy Mode = %d\n", pAd->CommonCfg.PhyMode));
if (Status != NDIS_STATUS_SUCCESS)
{
DBGPRINT_ERR(("NICReadRegParameters failed, Status[=0x%08x]\n",Status));
// goto err4;
Status = 0;
}
#ifdef RTMP_MAC_USB
pAd->CommonCfg.bMultipleIRP = FALSE;

95
drivers/staging/rt2860/rt_profile.c
View file

@ -1,95 +0,0 @@
/*
*************************************************************************
* Ralink Tech Inc.
* 5F., No.36, Taiyuan St., Jhubei City,
* Hsinchu County 302,
* Taiwan, R.O.C.
*
* (c) Copyright 2002-2007, Ralink Technology, Inc.
*
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
* *
*************************************************************************
Module Name:
rt_profile.c
Abstract:
Revision History:
Who When What
--------- ---------- ----------------------------------------------
*/
#include "rt_config.h"
NDIS_STATUS RTMPReadParametersHook(
IN PRTMP_ADAPTER pAd)
{
PSTRING src = NULL;
RTMP_OS_FD srcf;
RTMP_OS_FS_INFO osFSInfo;
INT retval = NDIS_STATUS_FAILURE;
PSTRING buffer;
buffer = kmalloc(MAX_INI_BUFFER_SIZE, MEM_ALLOC_FLAG);
if(buffer == NULL)
return NDIS_STATUS_FAILURE;
memset(buffer, 0x00, MAX_INI_BUFFER_SIZE);
{
{
src = STA_PROFILE_PATH;
}
}
if (src && *src)
{
RtmpOSFSInfoChange(&osFSInfo, TRUE);
srcf = RtmpOSFileOpen(src, O_RDONLY, 0);
if (IS_FILE_OPEN_ERR(srcf))
{
DBGPRINT(RT_DEBUG_ERROR, ("Open file \"%s\" failed!\n", src));
}
else
{
retval =RtmpOSFileRead(srcf, buffer, MAX_INI_BUFFER_SIZE);
if (retval > 0)
{
RTMPSetProfileParameters(pAd, buffer);
retval = NDIS_STATUS_SUCCESS;
}
else
DBGPRINT(RT_DEBUG_ERROR, ("Read file \"%s\" failed(errCode=%d)!\n", src, retval));
retval = RtmpOSFileClose(srcf);
if ( retval != 0)
{
retval = NDIS_STATUS_FAILURE;
DBGPRINT(RT_DEBUG_ERROR, ("Close file \"%s\" failed(errCode=%d)!\n", src, retval));
}
}
RtmpOSFSInfoChange(&osFSInfo, FALSE);
}
kfree(buffer);
return (retval);
}

3
drivers/staging/rt2860/rtmp.h
View file

@ -2453,9 +2453,6 @@ NDIS_STATUS RTMPAllocAdapterBlock(
NDIS_STATUS RTMPAllocTxRxRingMemory(
IN PRTMP_ADAPTER pAd);
NDIS_STATUS RTMPReadParametersHook(
IN PRTMP_ADAPTER pAd);
NDIS_STATUS RTMPSetProfileParameters(
IN RTMP_ADAPTER *pAd,
IN PSTRING pBuffer);

1
drivers/staging/rt2870/Makefile
View file

@ -39,7 +39,6 @@ rt2870sta-objs := \
sta/connect.o \
sta/wpa.o \
rt_linux.o \
rt_profile.o \
rt_main_dev.o \
sta_ioctl.o \
common/ba_action.o \