Commit 0fe20add authored by Johannes Berg's avatar Johannes Berg

mac80211: remove unused mesh data from bss

These pointers/values are never used, remove them.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent ce9877c0
...@@ -95,12 +95,6 @@ struct ieee80211_bss { ...@@ -95,12 +95,6 @@ struct ieee80211_bss {
bool wmm_used; bool wmm_used;
bool uapsd_supported; 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 #define IEEE80211_MAX_SUPP_RATES 32
u8 supp_rates[IEEE80211_MAX_SUPP_RATES]; u8 supp_rates[IEEE80211_MAX_SUPP_RATES];
size_t supp_rates_len; size_t supp_rates_len;
...@@ -151,31 +145,6 @@ enum ieee80211_bss_valid_data_flags { ...@@ -151,31 +145,6 @@ enum ieee80211_bss_valid_data_flags {
IEEE80211_BSS_VALID_ERP = BIT(3) 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; typedef unsigned __bitwise__ ieee80211_tx_result;
#define TX_CONTINUE ((__force ieee80211_tx_result) 0u) #define TX_CONTINUE ((__force ieee80211_tx_result) 0u)
#define TX_DROP ((__force ieee80211_tx_result) 1u) #define TX_DROP ((__force ieee80211_tx_result) 1u)
......
...@@ -29,14 +29,6 @@ ...@@ -29,14 +29,6 @@
#define IEEE80211_CHANNEL_TIME (HZ / 33) #define IEEE80211_CHANNEL_TIME (HZ / 33)
#define IEEE80211_PASSIVE_CHANNEL_TIME (HZ / 8) #define IEEE80211_PASSIVE_CHANNEL_TIME (HZ / 8)
static void ieee80211_rx_bss_free(struct cfg80211_bss *cbss)
{
struct ieee80211_bss *bss = (void *)cbss->priv;
kfree(bss_mesh_id(bss));
kfree(bss_mesh_cfg(bss));
}
void ieee80211_rx_bss_put(struct ieee80211_local *local, void ieee80211_rx_bss_put(struct ieee80211_local *local,
struct ieee80211_bss *bss) struct ieee80211_bss *bss)
{ {
...@@ -85,7 +77,6 @@ ieee80211_bss_info_update(struct ieee80211_local *local, ...@@ -85,7 +77,6 @@ ieee80211_bss_info_update(struct ieee80211_local *local,
if (!cbss) if (!cbss)
return NULL; return NULL;
cbss->free_priv = ieee80211_rx_bss_free;
bss = (void *)cbss->priv; bss = (void *)cbss->priv;
bss->device_ts = rx_status->device_timestamp; bss->device_ts = rx_status->device_timestamp;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment