diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-01-29 22:37:04 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-01-31 14:07:14 +0100 |
| commit | 0fe20add2c4b768ba8432ed15635caa46417ede7 (patch) | |
| tree | a9e75ce63fbace4935ba01b480ac31fed6d29342 /net/mac80211/ieee80211_i.h | |
| parent | ce9877c0cd68f52e1818f0e175fc7b2f85b0e655 (diff) | |
| download | kernel_goldelico_gta04-0fe20add2c4b768ba8432ed15635caa46417ede7.zip kernel_goldelico_gta04-0fe20add2c4b768ba8432ed15635caa46417ede7.tar.gz kernel_goldelico_gta04-0fe20add2c4b768ba8432ed15635caa46417ede7.tar.bz2 | |
mac80211: remove unused mesh data from bss
These pointers/values are never used, remove them.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 12666c2..e4ee168 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -95,12 +95,6 @@ struct ieee80211_bss { bool wmm_used; bool uapsd_supported; -#ifdef CONFIG_MAC80211_MESH - u8 *mesh_id; - size_t mesh_id_len; - u8 *mesh_cfg; -#endif - #define IEEE80211_MAX_SUPP_RATES 32 u8 supp_rates[IEEE80211_MAX_SUPP_RATES]; size_t supp_rates_len; @@ -151,31 +145,6 @@ enum ieee80211_bss_valid_data_flags { IEEE80211_BSS_VALID_ERP = BIT(3) }; -static inline u8 *bss_mesh_cfg(struct ieee80211_bss *bss) -{ -#ifdef CONFIG_MAC80211_MESH - return bss->mesh_cfg; -#endif - return NULL; -} - -static inline u8 *bss_mesh_id(struct ieee80211_bss *bss) -{ -#ifdef CONFIG_MAC80211_MESH - return bss->mesh_id; -#endif - return NULL; -} - -static inline u8 bss_mesh_id_len(struct ieee80211_bss *bss) -{ -#ifdef CONFIG_MAC80211_MESH - return bss->mesh_id_len; -#endif - return 0; -} - - typedef unsigned __bitwise__ ieee80211_tx_result; #define TX_CONTINUE ((__force ieee80211_tx_result) 0u) #define TX_DROP ((__force ieee80211_tx_result) 1u) |