Skip to contentSkip to conversation

remove a copy of 80211.h from staging.

PATCH Dave Jones 1 participant 1 message Jul 3, 2010 Staging

lore
Share & tools
lore

Dave Jones

author
#0 lore raw

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.

drivers/staging/rtl8192u/dot11d.h +1 -1
index 0851b9d..d99cc03 100644
@@ -2,7 +2,7 @@
 #define __INC_DOT11D_H
 
 #ifdef ENABLE_DOT11D
-#include "ieee80211.h"
+#include "ieee80211/ieee80211.h"
 
 
 typedef struct _CHNL_TXPOWER_TRIPLE {
drivers/staging/rtl8192u/ieee80211.h deleted +0 -2595

2,595 lines not on this page · raw message

drivers/staging/rtl8192u/r8192U.h +1 -1
index 69a2721..6206f92 100644
@@ -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"
drivers/staging/rtl8192u/r8192U_wx.h +1 -1
index b2f7a57..f4cf280 100644
@@ -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);
drivers/staging/rtl8192u/r819xU_firmware.c +1 -1
index 3cc2d57..b136ee4 100644
@@ -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"