Staging: rtl8192u: remove a copy of 80211.h

We had a request to enable one of the realtek network drivers in staging in Fedora.
After a quick lookover, I decided this wasn't such a great idea.

In doing so though, I noticed we have 6 copies of ieee80211.h there now,
Two drivers even have two copies of it.  (Even worse, cleanups have been pointlessly
happening to both files).  The patch below removes one of them, which is asides
from whitespace, identical afaics. With a change of filename to the #include,
it all still compiles for me.

A better fix would be to remove both, and have them use the core ieee80211 stuff,
but this is at least a tiny step in the right direction.

Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Dave Jones 2010-07-02 23:04:44 -04:00 committed by Greg Kroah-Hartman
parent 8e72c64115
commit 2addf798e4
5 changed files with 4 additions and 2599 deletions

View File

@ -2,7 +2,7 @@
#define __INC_DOT11D_H
#ifdef ENABLE_DOT11D
#include "ieee80211.h"
#include "ieee80211/ieee80211.h"
typedef struct _CHNL_TXPOWER_TRIPLE {

File diff suppressed because it is too large Load Diff

View File

@ -39,7 +39,7 @@
#include <linux/random.h>
#include <linux/version.h>
#include <asm/io.h>
#include "ieee80211.h"
#include "ieee80211/ieee80211.h"
#define RTL8192U
#define RTL819xU_MODULE_NAME "rtl819xU"

View File

@ -15,7 +15,7 @@
#ifndef R8180_WX_H
#define R8180_WX_H
//#include <linux/wireless.h>
//#include "ieee80211.h"
extern struct iw_handler_def r8192_wx_handlers_def;
/* Enable the rtl819x_core.c to share this function, david 2008.9.22 */
extern struct iw_statistics *r8192_get_wireless_stats(struct net_device *dev);

View File

@ -11,7 +11,7 @@
* NDIS_STATUS_FAILURE - the following initialization process should be terminated
* NDIS_STATUS_SUCCESS - if firmware initialization process success
**************************************************************************************************/
//#include "ieee80211.h"
#include "r8192U.h"
#include "r8192U_hw.h"
#include "r819xU_firmware_img.h"