Skip to contentSkip to conversation

d80211: merge d80211_mgmt.h into linux/ieee80211.h

PATCH New Michael Wu 1 participant 1 message Dec 9, 2006

Subsystems (4)
lore
Share & tools
lore

Michael Wu

author
#0 lore raw

PATCH 3/4 d80211: merge d80211_mgmt.h into linux/ieee80211.h

d80211: merge d80211_mgmt.h into linux/ieee80211.h

This merges d80211_mgmt.h with linux/ieee80211.h, to keep all the general 802.11 definitions in one place.

---

 drivers/net/wireless/d80211/bcm43xx/bcm43xx.h |    1 
 include/linux/ieee80211.h                     |  208 +++++++++++++++++++++++
 include/net/d80211_mgmt.h                     |  223 -------------------------
 net/d80211/ieee80211.c                        |    1 
 net/d80211/ieee80211_iface.c                  |    1 
 net/d80211/ieee80211_ioctl.c                  |    1 
 net/d80211/ieee80211_sta.c                    |    1 
 7 files changed, 208 insertions(+), 228 deletions(-)
drivers/net/wireless/d80211/bcm43xx/bcm43xx.h +0 -1
index 2a18875..a607857 100644
@@ -14,7 +14,6 @@
 #include <linux/ssb.h>
 #include <linux/wireless.h>
 #include <net/d80211.h>
-#include <net/d80211_mgmt.h>
 #include <net/d80211_common.h>
 
 #include "bcm43xx_debugfs.h"
include/linux/ieee80211.h +208 -0

212 lines not on this page · raw message

include/net/d80211_mgmt.h deleted +0 -223

223 lines not on this page · raw message

net/d80211/ieee80211.c +0 -1
index ec62c6e..d07d927 100644
@@ -23,7 +23,6 @@
 #include <linux/bitmap.h>
 
 #include <net/d80211_common.h>
-#include <net/d80211_mgmt.h>
 #include "ieee80211_i.h"
 #include "ieee80211_rate.h"
 #include "wep.h"
net/d80211/ieee80211_iface.c +0 -1
index 3e9d531..6d7222b 100644
@@ -12,7 +12,6 @@
 #include <linux/netdevice.h>
 #include <linux/rtnetlink.h>
 #include <net/d80211.h>
-#include <net/d80211_mgmt.h>
 #include "ieee80211_i.h"
 #include "sta_info.h"
 
net/d80211/ieee80211_ioctl.c +0 -1
index c74b431..fdd669c 100644
@@ -20,7 +20,6 @@
 #include <asm/uaccess.h>
 
 #include <net/d80211.h>
-#include <net/d80211_mgmt.h>
 #include "ieee80211_i.h"
 #include "hostapd_ioctl.h"
 #include "ieee80211_rate.h"
net/d80211/ieee80211_sta.c +0 -1
index 7594022..5196f67 100644
@@ -26,7 +26,6 @@
 #include <asm/delay.h>
 
 #include <net/d80211.h>
-#include <net/d80211_mgmt.h>
 #include "ieee80211_i.h"
 #include "ieee80211_rate.h"
 #include "hostapd_ioctl.h"