diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2007-09-28 08:02:09 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:54:15 -0400 |
commit | f9d540ee5f7e480339911df8d7389ef4c435ab54 (patch) | |
tree | 89381e4aa0f8ea31662dc21e890c339d715f8271 /net/mac80211/ieee80211_i.h | |
parent | a28975525016ddcbdaab8225666df1cf2dc9cb2d (diff) |
[MAC80211]: remove management interface
Removes the management interface since it is only required
for hostapd/userspace MLME, will not be in the final tree
at least in this form and hostapd/userspace MLME currently
do not work against this tree anyway.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 9e3c365e3f03..d24b0574c436 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -141,7 +141,6 @@ struct ieee80211_txrx_data { | |||
141 | * when using CTS protection with IEEE 802.11g. */ | 141 | * when using CTS protection with IEEE 802.11g. */ |
142 | struct ieee80211_rate *last_frag_rate; | 142 | struct ieee80211_rate *last_frag_rate; |
143 | int last_frag_hwrate; | 143 | int last_frag_hwrate; |
144 | int mgmt_interface; | ||
145 | 144 | ||
146 | /* Extra fragments (in addition to the first fragment | 145 | /* Extra fragments (in addition to the first fragment |
147 | * in skb) */ | 146 | * in skb) */ |
@@ -163,7 +162,6 @@ struct ieee80211_txrx_data { | |||
163 | #define IEEE80211_TXPD_REQ_TX_STATUS BIT(0) | 162 | #define IEEE80211_TXPD_REQ_TX_STATUS BIT(0) |
164 | #define IEEE80211_TXPD_DO_NOT_ENCRYPT BIT(1) | 163 | #define IEEE80211_TXPD_DO_NOT_ENCRYPT BIT(1) |
165 | #define IEEE80211_TXPD_REQUEUE BIT(2) | 164 | #define IEEE80211_TXPD_REQUEUE BIT(2) |
166 | #define IEEE80211_TXPD_MGMT_IFACE BIT(3) | ||
167 | /* Stored in sk_buff->cb */ | 165 | /* Stored in sk_buff->cb */ |
168 | struct ieee80211_tx_packet_data { | 166 | struct ieee80211_tx_packet_data { |
169 | int ifindex; | 167 | int ifindex; |
@@ -408,7 +406,6 @@ struct ieee80211_local { | |||
408 | struct list_head modes_list; | 406 | struct list_head modes_list; |
409 | 407 | ||
410 | struct net_device *mdev; /* wmaster# - "master" 802.11 device */ | 408 | struct net_device *mdev; /* wmaster# - "master" 802.11 device */ |
411 | struct net_device *apdev; /* wlan#ap - management frames (hostapd) */ | ||
412 | int open_count; | 409 | int open_count; |
413 | int monitors; | 410 | int monitors; |
414 | unsigned int filter_flags; /* FIF_* */ | 411 | unsigned int filter_flags; /* FIF_* */ |
@@ -704,14 +701,11 @@ static inline int ieee80211_bssid_match(const u8 *raddr, const u8 *addr) | |||
704 | int ieee80211_hw_config(struct ieee80211_local *local); | 701 | int ieee80211_hw_config(struct ieee80211_local *local); |
705 | int ieee80211_if_config(struct net_device *dev); | 702 | int ieee80211_if_config(struct net_device *dev); |
706 | int ieee80211_if_config_beacon(struct net_device *dev); | 703 | int ieee80211_if_config_beacon(struct net_device *dev); |
707 | void ieee80211_rx_mgmt(struct ieee80211_local *local, struct sk_buff *skb, | ||
708 | struct ieee80211_rx_status *status, u32 msg_type); | ||
709 | void ieee80211_prepare_rates(struct ieee80211_local *local, | 704 | void ieee80211_prepare_rates(struct ieee80211_local *local, |
710 | struct ieee80211_hw_mode *mode); | 705 | struct ieee80211_hw_mode *mode); |
711 | void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx); | 706 | void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx); |
712 | int ieee80211_if_update_wds(struct net_device *dev, u8 *remote_addr); | 707 | int ieee80211_if_update_wds(struct net_device *dev, u8 *remote_addr); |
713 | void ieee80211_if_setup(struct net_device *dev); | 708 | void ieee80211_if_setup(struct net_device *dev); |
714 | void ieee80211_if_mgmt_setup(struct net_device *dev); | ||
715 | struct ieee80211_rate *ieee80211_get_rate(struct ieee80211_local *local, | 709 | struct ieee80211_rate *ieee80211_get_rate(struct ieee80211_local *local, |
716 | int phymode, int hwrate); | 710 | int phymode, int hwrate); |
717 | 711 | ||
@@ -778,8 +772,6 @@ void __ieee80211_if_del(struct ieee80211_local *local, | |||
778 | int ieee80211_if_remove(struct net_device *dev, const char *name, int id); | 772 | int ieee80211_if_remove(struct net_device *dev, const char *name, int id); |
779 | void ieee80211_if_free(struct net_device *dev); | 773 | void ieee80211_if_free(struct net_device *dev); |
780 | void ieee80211_if_sdata_init(struct ieee80211_sub_if_data *sdata); | 774 | void ieee80211_if_sdata_init(struct ieee80211_sub_if_data *sdata); |
781 | int ieee80211_if_add_mgmt(struct ieee80211_local *local); | ||
782 | void ieee80211_if_del_mgmt(struct ieee80211_local *local); | ||
783 | 775 | ||
784 | /* regdomain.c */ | 776 | /* regdomain.c */ |
785 | void ieee80211_regdomain_init(void); | 777 | void ieee80211_regdomain_init(void); |
@@ -796,7 +788,6 @@ void ieee80211_tx_pending(unsigned long data); | |||
796 | int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev); | 788 | int ieee80211_master_start_xmit(struct sk_buff *skb, struct net_device *dev); |
797 | int ieee80211_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev); | 789 | int ieee80211_monitor_start_xmit(struct sk_buff *skb, struct net_device *dev); |
798 | int ieee80211_subif_start_xmit(struct sk_buff *skb, struct net_device *dev); | 790 | int ieee80211_subif_start_xmit(struct sk_buff *skb, struct net_device *dev); |
799 | int ieee80211_mgmt_start_xmit(struct sk_buff *skb, struct net_device *dev); | ||
800 | 791 | ||
801 | /* utility functions/constants */ | 792 | /* utility functions/constants */ |
802 | extern void *mac80211_wiphy_privid; /* for wiphy privid */ | 793 | extern void *mac80211_wiphy_privid; /* for wiphy privid */ |