diff options
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index fe4efdd4253d..2c91108e3901 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/types.h> | 23 | #include <linux/types.h> |
24 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
25 | #include <linux/etherdevice.h> | 25 | #include <linux/etherdevice.h> |
26 | #include <net/cfg80211.h> | ||
26 | #include <net/wireless.h> | 27 | #include <net/wireless.h> |
27 | #include <net/iw_handler.h> | 28 | #include <net/iw_handler.h> |
28 | #include <net/mac80211.h> | 29 | #include <net/mac80211.h> |
@@ -247,26 +248,6 @@ struct mesh_preq_queue { | |||
247 | u8 flags; | 248 | u8 flags; |
248 | }; | 249 | }; |
249 | 250 | ||
250 | struct mesh_config { | ||
251 | /* Timeouts in ms */ | ||
252 | /* Mesh plink management parameters */ | ||
253 | u16 dot11MeshRetryTimeout; | ||
254 | u16 dot11MeshConfirmTimeout; | ||
255 | u16 dot11MeshHoldingTimeout; | ||
256 | u16 dot11MeshMaxPeerLinks; | ||
257 | u8 dot11MeshMaxRetries; | ||
258 | u8 dot11MeshTTL; | ||
259 | bool auto_open_plinks; | ||
260 | /* HWMP parameters */ | ||
261 | u8 dot11MeshHWMPmaxPREQretries; | ||
262 | u32 path_refresh_time; | ||
263 | u16 min_discovery_timeout; | ||
264 | u32 dot11MeshHWMPactivePathTimeout; | ||
265 | u16 dot11MeshHWMPpreqMinInterval; | ||
266 | u16 dot11MeshHWMPnetDiameterTraversalTime; | ||
267 | }; | ||
268 | |||
269 | |||
270 | /* flags used in struct ieee80211_if_sta.flags */ | 251 | /* flags used in struct ieee80211_if_sta.flags */ |
271 | #define IEEE80211_STA_SSID_SET BIT(0) | 252 | #define IEEE80211_STA_SSID_SET BIT(0) |
272 | #define IEEE80211_STA_BSSID_SET BIT(1) | 253 | #define IEEE80211_STA_BSSID_SET BIT(1) |