diff options
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/dot11d.c | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192u/ieee80211/dot11d.h | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8192u/r8192U_core.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.c b/drivers/staging/rtl8192u/ieee80211/dot11d.c index 3c8e8ba999cf..19015394ad66 100644 --- a/drivers/staging/rtl8192u/ieee80211/dot11d.c +++ b/drivers/staging/rtl8192u/ieee80211/dot11d.c @@ -7,7 +7,7 @@ void rtl8192u_dot11d_init(struct ieee80211_device *ieee) { struct rt_dot11d_info *pDot11dInfo = GET_DOT11D_INFO(ieee); - pDot11dInfo->enabled = false; + pDot11dInfo->dot11d_enabled = false; pDot11dInfo->state = DOT11D_STATE_NONE; pDot11dInfo->country_ie_len = 0; diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.h b/drivers/staging/rtl8192u/ieee80211/dot11d.h index d217eb8063c4..cd312b51b549 100644 --- a/drivers/staging/rtl8192u/ieee80211/dot11d.h +++ b/drivers/staging/rtl8192u/ieee80211/dot11d.h @@ -28,12 +28,12 @@ struct rt_dot11d_info { u8 max_tx_pwr_dbm_list[MAX_CHANNEL_NUMBER + 1]; enum dot11d_state state; - bool enabled; /* dot11MultiDomainCapabilityEnabled */ + u8 dot11d_enabled; /* dot11MultiDomainCapabilityEnabled */ }; #define GET_DOT11D_INFO(ieee_dev) ((struct rt_dot11d_info *)((ieee_dev)->pDot11dInfo)) -#define IS_DOT11D_ENABLE(ieee_dev) (GET_DOT11D_INFO(ieee_dev)->enabled) +#define IS_DOT11D_ENABLE(ieee_dev) (GET_DOT11D_INFO(ieee_dev)->dot11d_enabled) #define IS_COUNTRY_IE_VALID(ieee_dev) (GET_DOT11D_INFO(ieee_dev)->country_ie_len > 0) #define IS_EQUAL_CIE_SRC(ieee_dev, addr) ether_addr_equal(GET_DOT11D_INFO(ieee_dev)->country_ie_src_addr, addr) diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index 0a21a76dcbc3..f6ee605bd235 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c @@ -211,7 +211,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv *priv) /* this flag enabled to follow 11d country IE setting, * otherwise, it shall follow global domain settings. */ - GET_DOT11D_INFO(ieee)->enabled = 0; + GET_DOT11D_INFO(ieee)->dot11d_enabled = 0; dot11d_reset(ieee); ieee->bGlobalDomain = true; break; |