diff options
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 6c62dd42f915..0997a0f96203 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -69,14 +69,6 @@ struct ieee80211_fragment_entry { | |||
69 | u8 last_pn[6]; /* PN of the last fragment if CCMP was used */ | 69 | u8 last_pn[6]; /* PN of the last fragment if CCMP was used */ |
70 | }; | 70 | }; |
71 | 71 | ||
72 | struct bss_mesh_config { | ||
73 | u32 path_proto_id; | ||
74 | u32 path_metric_id; | ||
75 | u32 cong_control_id; | ||
76 | u32 channel_precedence; | ||
77 | u8 mesh_version; | ||
78 | }; | ||
79 | |||
80 | 72 | ||
81 | struct ieee80211_sta_bss { | 73 | struct ieee80211_sta_bss { |
82 | struct list_head list; | 74 | struct list_head list; |
@@ -102,7 +94,7 @@ struct ieee80211_sta_bss { | |||
102 | #ifdef CONFIG_MAC80211_MESH | 94 | #ifdef CONFIG_MAC80211_MESH |
103 | u8 *mesh_id; | 95 | u8 *mesh_id; |
104 | size_t mesh_id_len; | 96 | size_t mesh_id_len; |
105 | struct bss_mesh_config *mesh_cfg; | 97 | u8 *mesh_cfg; |
106 | #endif | 98 | #endif |
107 | #define IEEE80211_MAX_SUPP_RATES 32 | 99 | #define IEEE80211_MAX_SUPP_RATES 32 |
108 | u8 supp_rates[IEEE80211_MAX_SUPP_RATES]; | 100 | u8 supp_rates[IEEE80211_MAX_SUPP_RATES]; |
@@ -121,8 +113,7 @@ struct ieee80211_sta_bss { | |||
121 | u8 erp_value; | 113 | u8 erp_value; |
122 | }; | 114 | }; |
123 | 115 | ||
124 | static inline | 116 | static inline u8 *bss_mesh_cfg(struct ieee80211_sta_bss *bss) |
125 | struct bss_mesh_config *bss_mesh_cfg(struct ieee80211_sta_bss *bss) | ||
126 | { | 117 | { |
127 | #ifdef CONFIG_MAC80211_MESH | 118 | #ifdef CONFIG_MAC80211_MESH |
128 | return bss->mesh_cfg; | 119 | return bss->mesh_cfg; |