Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[safe/jmp/linux-2.6] / net / mac80211 / ieee80211_i.h

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 74e7993..04093e8 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -312,6 +312,8 @@ struct ieee80211_if_managed {
        } mfp; /* management frame protection */
 
        int wmm_last_param_set;
+
+       u8 use_4addr;
 };
 
 enum ieee80211_ibss_request {
@@ -459,8 +461,6 @@ struct ieee80211_sub_if_data {
        int force_unicast_rateidx; /* forced TX rateidx for unicast frames */
        int max_ratectrl_rateidx; /* max TX rateidx for rate control */
 
-       bool use_4addr; /* use 4-address frames */
-
        union {
                struct ieee80211_if_ap ap;
                struct ieee80211_if_wds wds;
@@ -579,7 +579,6 @@ struct ieee80211_local {
        /* number of interfaces with corresponding FIF_ flags */
        int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
        unsigned int filter_flags; /* FIF_* */
-       struct iw_statistics wstats;
 
        /* protects the aggregated multicast list and filter calls */
        spinlock_t filter_lock;
@@ -798,7 +797,7 @@ struct ieee802_11_elems {
        u8 *wmm_param;
        struct ieee80211_ht_cap *ht_cap_elem;
        struct ieee80211_ht_info *ht_info_elem;
-       u8 *mesh_config;
+       struct ieee80211_meshconf_ie *mesh_config;
        u8 *mesh_id;
        u8 *peer_link;
        u8 *preq;
@@ -826,7 +825,6 @@ struct ieee802_11_elems {
        u8 ext_supp_rates_len;
        u8 wmm_info_len;
        u8 wmm_param_len;
-       u8 mesh_config_len;
        u8 mesh_id_len;
        u8 peer_link_len;
        u8 preq_len;