staging: rtl8192e: Rename bNetPromisc.., IntelPromiscu.. and bPromiscu..

Rename variable bNetPromiscuousMode to net_promiscuous_md,
IntelPromiscuousModeInfo to intel_promiscuous_md_info and bPromiscuousOn
to promiscuous_on to avoid CamelCase which is not accepted by checkpatch.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/69d9998a30ce2286c3ae6cb4510174e1255b3f9e.1668313325.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
index d0ce898..2ccd1e0 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
+++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c
@@ -859,7 +859,7 @@ void rtl92e_link_change(struct net_device *dev)
 
                reg = rtl92e_readl(dev, RCR);
                if (priv->rtllib->state == RTLLIB_LINKED) {
-                       if (ieee->IntelPromiscuousModeInfo.bPromiscuousOn)
+                       if (ieee->intel_promiscuous_md_info.promiscuous_on)
                                ;
                        else
                                priv->ReceiveConfig = reg |= RCR_CBSSID;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 3379b42..94b8ed2 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -848,9 +848,9 @@ static void _rtl92e_init_priv_variable(struct net_device *dev)
        priv->reg_chnl_plan = 0xf;
        priv->rtllib->mode = WIRELESS_MODE_AUTO;
        priv->rtllib->iw_mode = IW_MODE_INFRA;
-       priv->rtllib->bNetPromiscuousMode = false;
-       priv->rtllib->IntelPromiscuousModeInfo.bPromiscuousOn = false;
-       priv->rtllib->IntelPromiscuousModeInfo.bFilterSourceStationFrame =
+       priv->rtllib->net_promiscuous_md = false;
+       priv->rtllib->intel_promiscuous_md_info.promiscuous_on = false;
+       priv->rtllib->intel_promiscuous_md_info.bFilterSourceStationFrame =
                                                                 false;
        priv->rtllib->ieee_up = 0;
        priv->retry_rts = DEFAULT_RETRY_RTS;
@@ -1297,13 +1297,13 @@ static void _rtl92e_watchdog_wq_cb(void *data)
                     (!ieee->proto_stoppping) && !ieee->wx_set_enc) {
                        if ((ieee->pwr_save_ctrl.ReturnPoint ==
                             IPS_CALLBACK_NONE) &&
-                            (!ieee->bNetPromiscuousMode)) {
+                            (!ieee->net_promiscuous_md)) {
                                rtl92e_ips_enter(dev);
                        }
                }
        }
        if ((ieee->state == RTLLIB_LINKED) && (ieee->iw_mode ==
-            IW_MODE_INFRA) && (!ieee->bNetPromiscuousMode)) {
+            IW_MODE_INFRA) && (!ieee->net_promiscuous_md)) {
                if (ieee->link_detect_info.NumRxOkInPeriod > 100 ||
                ieee->link_detect_info.NumTxOkInPeriod > 100)
                        bBusyTraffic = true;

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
index 4f16c3d..c31e5b5 100644 (file)
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c
@@ -251,7 +251,7 @@ static int _rtl92e_wx_set_mode(struct net_device *dev,
        rt_state = priv->rtllib->rf_power_state;
        mutex_lock(&priv->wx_mutex);
        if (wrqu->mode == IW_MODE_ADHOC || wrqu->mode == IW_MODE_MONITOR ||
-           ieee->bNetPromiscuousMode) {
+           ieee->net_promiscuous_md) {
                if (rt_state == rf_off) {
                        if (priv->rtllib->rf_off_reason >
                            RF_CHANGE_BY_IPS) {
@@ -1014,28 +1014,28 @@ static int _rtl92e_wx_set_promisc_mode(struct net_device *dev,
        u32 info_buf[3];
 
        u32 oid;
-       u32 bPromiscuousOn;
+       u32 promiscuous_on;
        u32 bFilterSourceStationFrame;
 
        if (copy_from_user(info_buf, wrqu->data.pointer, sizeof(info_buf)))
                return -EFAULT;
 
        oid = info_buf[0];
-       bPromiscuousOn = info_buf[1];
+       promiscuous_on = info_buf[1];
        bFilterSourceStationFrame = info_buf[2];
 
        if (oid == OID_RT_INTEL_PROMISCUOUS_MODE) {
-               ieee->IntelPromiscuousModeInfo.bPromiscuousOn =
-                                       (bPromiscuousOn) ? (true) : (false);
-               ieee->IntelPromiscuousModeInfo.bFilterSourceStationFrame =
+               ieee->intel_promiscuous_md_info.promiscuous_on =
+                                       (promiscuous_on) ? (true) : (false);
+               ieee->intel_promiscuous_md_info.bFilterSourceStationFrame =
                        (bFilterSourceStationFrame) ? (true) : (false);
-               (bPromiscuousOn) ?
+               (promiscuous_on) ?
                (rtllib_EnableIntelPromiscuousMode(dev, false)) :
                (rtllib_DisableIntelPromiscuousMode(dev, false));
 
                netdev_info(dev,
                            "=======>%s(), on = %d, filter src sta = %d\n",
-                           __func__, bPromiscuousOn,
+                           __func__, promiscuous_on,
                            bFilterSourceStationFrame);
        } else {
                return -1;
@@ -1054,8 +1054,8 @@ static int _rtl92e_wx_get_promisc_mode(struct net_device *dev,
        mutex_lock(&priv->wx_mutex);
 
        snprintf(extra, 45, "PromiscuousMode:%d, FilterSrcSTAFrame:%d",
-                ieee->IntelPromiscuousModeInfo.bPromiscuousOn,
-                ieee->IntelPromiscuousModeInfo.bFilterSourceStationFrame);
+                ieee->intel_promiscuous_md_info.promiscuous_on,
+                ieee->intel_promiscuous_md_info.bFilterSourceStationFrame);
        wrqu->data.length = strlen(extra) + 1;
 
        mutex_unlock(&priv->wx_mutex);

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index b5313c1..493759c 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -1384,7 +1384,7 @@ struct rt_pmkid_list {
 };
 
 struct rt_intel_promisc_mode {
-       bool bPromiscuousOn;
+       bool promiscuous_on;
        bool bFilterSourceStationFrame;
 };
 
@@ -1470,8 +1470,8 @@ struct rtllib_device {
        int scan_age;
 
        int iw_mode; /* operating mode (IW_MODE_*) */
-       bool bNetPromiscuousMode;
-       struct rt_intel_promisc_mode IntelPromiscuousModeInfo;
+       bool net_promiscuous_md;
+       struct rt_intel_promisc_mode intel_promiscuous_md_info;
 
        spinlock_t lock;
        spinlock_t wpax_suitlist_lock;

diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c
index f9a35fc..ccb61d8 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_rx.c
+++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -999,8 +999,8 @@ static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc,
        }
 
        /* Filter packets sent by an STA that will be forwarded by AP */
-       if (ieee->IntelPromiscuousModeInfo.bPromiscuousOn  &&
-               ieee->IntelPromiscuousModeInfo.bFilterSourceStationFrame) {
+       if (ieee->intel_promiscuous_md_info.promiscuous_on  &&
+               ieee->intel_promiscuous_md_info.bFilterSourceStationFrame) {
                if ((fc & RTLLIB_FCTL_TODS) && !(fc & RTLLIB_FCTL_FROMDS) &&
                    !ether_addr_equal(dst, ieee->current_network.bssid) &&
                    ether_addr_equal(bssid, ieee->current_network.bssid)) {
@@ -1011,7 +1011,7 @@ static int rtllib_rx_data_filter(struct rtllib_device *ieee, u16 fc,
        /* Nullfunc frames may have PS-bit set, so they must be passed to
         * hostap_handle_sta_rx() before being dropped here.
         */
-       if (!ieee->IntelPromiscuousModeInfo.bPromiscuousOn) {
+       if (!ieee->intel_promiscuous_md_info.promiscuous_on) {
                if (stype != RTLLIB_STYPE_DATA &&
                    stype != RTLLIB_STYPE_DATA_CFACK &&
                    stype != RTLLIB_STYPE_DATA_CFPOLL &&
@@ -1317,7 +1317,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device *ieee, struct sk_buff *skb,
        multicast = is_multicast_ether_addr(hdr->addr1);
        unicast = !multicast;
        if (unicast && !ether_addr_equal(dev->dev_addr, hdr->addr1)) {
-               if (ieee->bNetPromiscuousMode)
+               if (ieee->net_promiscuous_md)
                        bToOtherSTA = true;
                else
                        goto rx_dropped;

diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c
index 1d583e7..8b1d880 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_softmac.c
+++ b/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -445,7 +445,7 @@ void rtllib_EnableIntelPromiscuousMode(struct net_device *dev,
        ieee->SetHwRegHandler(dev, HW_VAR_CECHK_BSSID,
                             (u8 *)&bFilterOutNonAssociatedBSSID);
 
-       ieee->bNetPromiscuousMode = true;
+       ieee->net_promiscuous_md = true;
 }
 EXPORT_SYMBOL(rtllib_EnableIntelPromiscuousMode);
 
@@ -466,7 +466,7 @@ void rtllib_DisableIntelPromiscuousMode(struct net_device *dev,
        ieee->SetHwRegHandler(dev, HW_VAR_CECHK_BSSID,
                             (u8 *)&bFilterOutNonAssociatedBSSID);
 
-       ieee->bNetPromiscuousMode = false;
+       ieee->net_promiscuous_md = false;
 }
 EXPORT_SYMBOL(rtllib_DisableIntelPromiscuousMode);