staging:rtl8192u: Refactor member variable enabled - Style

The structure rt_dot11d_info contains a memeber variable 'enabled',
which causes a checkpatch issue as it is declared as being of type
bool. The type of the variable has been changed to a 'u8', to clear
the issue.

Additionally to aid searching for the member variable in code it
has been renamed from 'enabled' to 'dot11d_enabled'.

These are purely coding style changes which should not impact runtime
code execution.

Signed-off-by: John Whitmore <johnfwhitmore@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192u/ieee80211/dot11d.c b/drivers/staging/rtl8192u/ieee80211/dot11d.c
index 3c8e8ba999cfac5d9b3769320495627e66d58b27..19015394ad6632c13ba3521bace03c9a9b7614ca 100644 (file)
--- 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 d217eb8063c4f13bc0fa08024461f1109b0c11c9..cd312b51b549b5542f5fa22d5e3875d80eebc532 100644 (file)
--- 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 0a21a76dcbc3d9399250c6ede27a6ff7566634a9..f6ee605bd235b85a2643ea6c992a49766f759ad7 100644 (file)
--- 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;