aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-11-18 10:54:50 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-11-21 16:20:49 -0500
commitdd76986b0e398978ca32dd60c1b7dc50ab4e9ae1 (patch)
treefea61a3dcb75a0c90e772b2beeaf4edb49ae7b50 /include
parent80b998993d97d8a13589f8462e62a60298c72cf2 (diff)
cfg80211/mac80211: Revert "move information element parsing logic to cfg80211"
No other driver ever ended up using this, and the commit forgot to move the prototype so no driver could have used it. Revert it, if any driver shows up and needs it it can be moved again, but until then it's more efficient to have it in mac80211 where the only user is. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r--include/net/cfg80211.h63
1 files changed, 0 insertions, 63 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 26890045dbd6..6a1d849c597a 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -2391,69 +2391,6 @@ extern int ieee80211_radiotap_iterator_next(
2391extern const unsigned char rfc1042_header[6]; 2391extern const unsigned char rfc1042_header[6];
2392extern const unsigned char bridge_tunnel_header[6]; 2392extern const unsigned char bridge_tunnel_header[6];
2393 2393
2394/* Parsed Information Elements */
2395struct ieee802_11_elems {
2396 u8 *ie_start;
2397 size_t total_len;
2398
2399 /* pointers to IEs */
2400 u8 *ssid;
2401 u8 *supp_rates;
2402 u8 *fh_params;
2403 u8 *ds_params;
2404 u8 *cf_params;
2405 struct ieee80211_tim_ie *tim;
2406 u8 *ibss_params;
2407 u8 *challenge;
2408 u8 *wpa;
2409 u8 *rsn;
2410 u8 *erp_info;
2411 u8 *ext_supp_rates;
2412 u8 *wmm_info;
2413 u8 *wmm_param;
2414 struct ieee80211_ht_cap *ht_cap_elem;
2415 struct ieee80211_ht_info *ht_info_elem;
2416 struct ieee80211_meshconf_ie *mesh_config;
2417 u8 *mesh_id;
2418 u8 *peering;
2419 u8 *preq;
2420 u8 *prep;
2421 u8 *perr;
2422 struct ieee80211_rann_ie *rann;
2423 u8 *ch_switch_elem;
2424 u8 *country_elem;
2425 u8 *pwr_constr_elem;
2426 u8 *quiet_elem; /* first quite element */
2427 u8 *timeout_int;
2428
2429 /* length of them, respectively */
2430 u8 ssid_len;
2431 u8 supp_rates_len;
2432 u8 fh_params_len;
2433 u8 ds_params_len;
2434 u8 cf_params_len;
2435 u8 tim_len;
2436 u8 ibss_params_len;
2437 u8 challenge_len;
2438 u8 wpa_len;
2439 u8 rsn_len;
2440 u8 erp_info_len;
2441 u8 ext_supp_rates_len;
2442 u8 wmm_info_len;
2443 u8 wmm_param_len;
2444 u8 mesh_id_len;
2445 u8 peering_len;
2446 u8 preq_len;
2447 u8 prep_len;
2448 u8 perr_len;
2449 u8 ch_switch_elem_len;
2450 u8 country_elem_len;
2451 u8 pwr_constr_elem_len;
2452 u8 quiet_elem_len;
2453 u8 num_of_quiet_elem; /* can be more the one */
2454 u8 timeout_int_len;
2455};
2456
2457/** 2394/**
2458 * ieee80211_get_hdrlen_from_skb - get header length from data 2395 * ieee80211_get_hdrlen_from_skb - get header length from data
2459 * 2396 *