staging: rtl8712: rename function

Rename r8712_get_ndis_wlan_bssid_ex_sz() to r8712_get_wlan_bssid_ex_sz(),
which corresponds to the struct whose size it measures.

Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index 06d9844ac7228aa2d346dac24314a7b4d8899572..ef7182961002e8c45394a6a208cfe9bf850023e3 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -456,7 +456,7 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
        INIT_LIST_HEAD(&pcmd->list);
        pcmd->cmdcode = _CreateBss_CMD_;
        pcmd->parmbuf = (unsigned char *)pdev_network;
-       pcmd->cmdsz = r8712_get_ndis_wlan_bssid_ex_sz(pdev_network);
+       pcmd->cmdsz = r8712_get_wlan_bssid_ex_sz(pdev_network);
        pcmd->rsp = NULL;
        pcmd->rspsz = 0;
        /* notes: translate IELength & Length after assign to cmdsz; */
@@ -564,7 +564,7 @@ u8 r8712_joinbss_cmd(struct _adapter  *padapter, struct wlan_network *pnetwork)
                memcpy(&psecuritypriv->supplicant_ie[1], &psecnetwork->IEs[0],
                        255);
        /* get cmdsz before endian conversion */
-       pcmd->cmdsz = r8712_get_ndis_wlan_bssid_ex_sz(psecnetwork);
+       pcmd->cmdsz = r8712_get_wlan_bssid_ex_sz(psecnetwork);
 #ifdef __BIG_ENDIAN
        /* wlan_network endian conversion */
        psecnetwork->Length = cpu_to_le32(psecnetwork->Length);
@@ -946,11 +946,11 @@ void r8712_createbss_cmd_callback(struct _adapter *padapter,
                } else
                        list_add_tail(&(pwlan->list),
                                         &pmlmepriv->scanned_queue.queue);
-               pnetwork->Length = r8712_get_ndis_wlan_bssid_ex_sz(pnetwork);
+               pnetwork->Length = r8712_get_wlan_bssid_ex_sz(pnetwork);
                memcpy(&(pwlan->network), pnetwork, pnetwork->Length);
                pwlan->fixed = true;
                memcpy(&tgt_network->network, pnetwork,
-                       (r8712_get_ndis_wlan_bssid_ex_sz(pnetwork)));
+                       (r8712_get_wlan_bssid_ex_sz(pnetwork)));
                if (pmlmepriv->fw_state & _FW_UNDER_LINKING)
                        pmlmepriv->fw_state ^= _FW_UNDER_LINKING;
                /* we will set _FW_LINKED when there is one more sat to

diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index 7af96993c6a58724022943a2924ef4777f550e24..fc5dbea08cb490d53cda38f81c3e3404fac09b6a 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -208,7 +208,7 @@ void r8712_generate_random_ibss(u8 *pibss)
        pibss[5] = (u8)((curtime>>16) & 0xff);
 }
 
-uint r8712_get_ndis_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss)
+uint r8712_get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss)
 {
        return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
 }
@@ -356,7 +356,7 @@ static void update_network(struct wlan_bssid_ex *dst,
                src->Rssi = padapter->recvpriv.signal;
        } else
                src->Rssi = (src->Rssi + dst->Rssi) / 2;
-       memcpy((u8 *)dst, (u8 *)src, r8712_get_ndis_wlan_bssid_ex_sz(src));
+       memcpy((u8 *)dst, (u8 *)src, r8712_get_wlan_bssid_ex_sz(src));
 }
 
 static void update_current_network(struct _adapter *adapter,
@@ -416,7 +416,7 @@ static void update_scanned_network(struct _adapter *adapter,
                        target->Rssi = (pnetwork->network.Rssi +
                                        target->Rssi) / 2;
                        memcpy(&pnetwork->network, target,
-                               r8712_get_ndis_wlan_bssid_ex_sz(target));
+                               r8712_get_wlan_bssid_ex_sz(target));
                        pnetwork->last_scanned = jiffies;
                } else {
                        /* Otherwise just pull from the free list */
@@ -424,7 +424,7 @@ static void update_scanned_network(struct _adapter *adapter,
                        pnetwork = alloc_network(pmlmepriv);
                        if (pnetwork == NULL)
                                return;
-                       bssid_ex_sz = r8712_get_ndis_wlan_bssid_ex_sz(target);
+                       bssid_ex_sz = r8712_get_wlan_bssid_ex_sz(target);
                        target->Length = bssid_ex_sz;
                        memcpy(&pnetwork->network, target, bssid_ex_sz);
                        list_add_tail(&pnetwork->list, &queue->queue);
@@ -528,7 +528,7 @@ void r8712_survey_event_callback(struct _adapter *adapter, u8 *pbuf)
                 le32_to_cpu(pnetwork->InfrastructureMode);
        pnetwork->IELength = le32_to_cpu(pnetwork->IELength);
 #endif
-       len = r8712_get_ndis_wlan_bssid_ex_sz(pnetwork);
+       len = r8712_get_wlan_bssid_ex_sz(pnetwork);
        if (len > sizeof(struct wlan_bssid_ex))
                return;
        spin_lock_irqsave(&pmlmepriv->lock2, flags);
@@ -759,7 +759,7 @@ void r8712_joinbss_event_callback(struct _adapter *adapter, u8 *pbuf)
        the_same_macaddr = !memcmp(pnetwork->network.MacAddress,
                                   cur_network->network.MacAddress, ETH_ALEN);
        pnetwork->network.Length =
-                r8712_get_ndis_wlan_bssid_ex_sz(&pnetwork->network);
+                r8712_get_wlan_bssid_ex_sz(&pnetwork->network);
        spin_lock_irqsave(&pmlmepriv->lock, irqL);
        if (pnetwork->network.Length > sizeof(struct wlan_bssid_ex))
                goto ignore_joinbss_callback;
@@ -991,7 +991,7 @@ void r8712_stadel_event_callback(struct _adapter *adapter, u8 *pbuf)
                        pdev_network = &(adapter->registrypriv.dev_network);
                        pibss = adapter->registrypriv.dev_network.MacAddress;
                        memcpy(pdev_network, &tgt_network->network,
-                               r8712_get_ndis_wlan_bssid_ex_sz(&tgt_network->
+                               r8712_get_wlan_bssid_ex_sz(&tgt_network->
                                                        network));
                        memcpy(&pdev_network->Ssid,
                                &pmlmepriv->assoc_ssid,
@@ -1658,7 +1658,7 @@ void r8712_update_registrypriv_dev_network(struct _adapter *adapter)
         */
        sz = r8712_generate_ie(pregistrypriv);
        pdev_network->IELength = sz;
-       pdev_network->Length = r8712_get_ndis_wlan_bssid_ex_sz(pdev_network);
+       pdev_network->Length = r8712_get_wlan_bssid_ex_sz(pdev_network);
 }
 
 /*the function is at passive_level*/

diff --git a/drivers/staging/rtl8712/rtl871x_mlme.h b/drivers/staging/rtl8712/rtl871x_mlme.h
index 47bb9c5e9708e5e33394c4e3998366394b59cc6b..08d6c986c11e26f5afe8f3eaab963ab31b54f949 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_mlme.h
+++ b/drivers/staging/rtl8712/rtl871x_mlme.h
@@ -202,7 +202,7 @@ sint r8712_set_key(struct _adapter *adapter,
                   struct security_priv *psecuritypriv, sint keyid);
 sint r8712_set_auth(struct _adapter *adapter,
                    struct security_priv *psecuritypriv);
-uint r8712_get_ndis_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss);
+uint r8712_get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss);
 void r8712_generate_random_ibss(u8 *pibss);
 u8 *r8712_get_capability_from_ie(u8 *ie);
 struct wlan_network *r8712_get_oldest_wlan_network(

diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
index c77b63affdc5edcb9fac4933c587720989897abb..77f01bf1ca3c023e04653e7c1e5290ad4efb398d 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
+++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c
@@ -174,7 +174,7 @@ static int mp_start_test(struct _adapter *padapter)
        bssid.InfrastructureMode = Ndis802_11IBSS;
        bssid.NetworkTypeInUse = Ndis802_11DS;
        bssid.IELength = 0;
-       length = r8712_get_ndis_wlan_bssid_ex_sz(&bssid);
+       length = r8712_get_wlan_bssid_ex_sz(&bssid);
        if (length % 4) {
                /*round up to multiple of 4 bytes.*/
                bssid.Length = ((length >> 2) + 1) << 2;