Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / csr / sme_wext.c

diff --git a/drivers/staging/csr/sme_wext.c b/drivers/staging/csr/sme_wext.c
index 3ba7b4cef2ddf6ada55f31214eb6ed3372fdcf0a..7e85907e29a3ecc9edb49495a10ee45e1f62b835 100644 (file)
--- a/drivers/staging/csr/sme_wext.c
+++ b/drivers/staging/csr/sme_wext.c
@@ -457,10 +457,10 @@ static int decode_parameter_from_string(unifi_priv_t* priv, char **str_ptr,
                                         const char *token, int param_type,
                                         void  *dst, int param_max_len)
 {
-    CsrUint8 int_str[7] = "0";
-    CsrUint32 param_str_len;
-    CsrUint8  *param_str_begin,*param_str_end;
-    CsrUint8  *orig_str = *str_ptr;
+    u8 int_str[7] = "0";
+    u32 param_str_len;
+    u8  *param_str_begin,*param_str_end;
+    u8  *orig_str = *str_ptr;
 
     if (!strncmp(*str_ptr, token, strlen(token))) {
         strsep(str_ptr, "=,");
@@ -480,7 +480,7 @@ static int decode_parameter_from_string(unifi_priv_t* priv, char **str_ptr,
         switch (param_type) {
             case PARAM_TYPE_INT:
             {
-                CsrUint32 *pdst_int = dst,num =0;
+                u32 *pdst_int = dst,num =0;
                 int i,j=0;
                 if (param_str_len > sizeof(int_str)) {
                     param_str_len = sizeof(int_str);
@@ -616,7 +616,7 @@ static int store_ap_config_from_string( unifi_priv_t * priv,char *param_str)
         int i,j=0;
         CsrWifiNmeApAuthPers *pers =
                             ((CsrWifiNmeApAuthPers *)&(ap_config->credentials.nmeAuthType.authTypePersonal));
-        CsrUint8 *psk = pers->authPers_credentials.psk.psk;
+        u8 *psk = pers->authPers_credentials.psk.psk;
 
         unifi_trace(priv,UDBG2,"store_ap_config_from_string: security WPA2");
         if(ret) {
@@ -727,7 +727,7 @@ iwprivsapstop(struct net_device *dev, struct iw_request_info *info,
     netInterface_priv_t *interfacePriv = (netInterface_priv_t *)netdev_priv(dev);
     unifi_priv_t *priv = interfacePriv->privPtr;
     int r;
-    CsrUint16 interface_tag = interfacePriv->InterfaceTag;
+    u16 interface_tag = interfacePriv->InterfaceTag;
 
     unifi_trace(priv, UDBG1, "iwprivsapstop\n" );
     r = sme_ap_stop(priv,interface_tag);
@@ -766,7 +766,7 @@ iwprivsstackstop(struct net_device *dev, struct iw_request_info *info,
     netInterface_priv_t *interfacePriv = (netInterface_priv_t *)netdev_priv(dev);
     unifi_priv_t *priv = interfacePriv->privPtr;
     int r = 0;
-    CsrUint16 interface_tag = interfacePriv->InterfaceTag;
+    u16 interface_tag = interfacePriv->InterfaceTag;
 
     unifi_trace(priv, UDBG1, "iwprivsstackstop\n" );
 
@@ -797,7 +797,7 @@ static int
 iwprivsconfwapi(struct net_device *dev, struct iw_request_info *info,
         union iwreq_data *wrqu, char *extra)
 {
-    CsrUint8 enable;
+    u8 enable;
     netInterface_priv_t *interfacePriv = (netInterface_priv_t *)netdev_priv(dev);
     unifi_priv_t *priv = interfacePriv->privPtr;
     func_enter();
@@ -811,7 +811,7 @@ iwprivsconfwapi(struct net_device *dev, struct iw_request_info *info,
        return -EPERM;
     }
 
-    enable = *(CsrUint8*)(extra);
+    enable = *(u8*)(extra);
 
     if (enable) {
         priv->connection_config.authModeMask = CSR_WIFI_SME_AUTH_MODE_80211_OPEN;
@@ -1210,13 +1210,8 @@ unifi_siwap(struct net_device *dev, struct iw_request_info *info,
         return -EINVAL;
     }
 
-    unifi_trace(priv, UDBG1, "unifi_siwap: asked for %02X:%02X:%02X:%02X:%02X:%02X\n",
-                (u8)wrqu->ap_addr.sa_data[0],
-                (u8)wrqu->ap_addr.sa_data[1],
-                (u8)wrqu->ap_addr.sa_data[2],
-                (u8)wrqu->ap_addr.sa_data[3],
-                (u8)wrqu->ap_addr.sa_data[4],
-                (u8)wrqu->ap_addr.sa_data[5]);
+       unifi_trace(priv, UDBG1, "unifi_siwap: asked for %pM\n",
+               wrqu->ap_addr.sa_data);
 
     if (!memcmp(wrqu->ap_addr.sa_data, zero_bssid, ETH_ALEN)) {
         priv->ignore_bssid_join = FALSE;
@@ -1260,7 +1255,7 @@ unifi_giwap(struct net_device *dev, struct iw_request_info *info,
     unifi_priv_t *priv = interfacePriv->privPtr;
     CsrWifiSmeConnectionInfo connectionInfo;
     int r = 0;
-    CsrUint8 *bssid;
+    u8 *bssid;
 
     func_enter();
 
@@ -1281,10 +1276,7 @@ unifi_giwap(struct net_device *dev, struct iw_request_info *info,
     if (r == 0) {
         bssid = connectionInfo.bssid.a;
         wrqu->ap_addr.sa_family = ARPHRD_ETHER;
-        unifi_trace(priv, UDBG4,
-                    "unifi_giwap: BSSID = %02X:%02X:%02X:%02X:%02X:%02X\n",
-                    bssid[0], bssid[1], bssid[2],
-                    bssid[3], bssid[4], bssid[5]);
+               unifi_trace(priv, UDBG4, "unifi_giwap: BSSID = %pM\n", bssid);
 
         memcpy(wrqu->ap_addr.sa_data, bssid, ETH_ALEN);
     } else {
@@ -2936,8 +2928,7 @@ _unifi_siwencodeext(struct net_device *dev, struct iw_request_info *info,
     unifi_trace(priv, UDBG1, "siwencodeext: flags=0x%X, alg=%d, ext_flags=0x%X, len=%d, index=%d,\n",
                 wrqu->encoding.flags, ext->alg, ext->ext_flags,
                 ext->key_len, (wrqu->encoding.flags & IW_ENCODE_INDEX));
-    unifi_trace(priv, UDBG3, "              addr=%02X:%02X:%02X:%02X:%02X:%02X\n",
-                a[0], a[1], a[2], a[3], a[4], a[5]);
+       unifi_trace(priv, UDBG3, "              addr=%pM\n", a);
 
     if ((ext->key_len == 0) && (ext->ext_flags & IW_ENCODE_EXT_SET_TX_KEY)) {
         /* This means use a different key (given by key_idx) for Tx. */
@@ -3140,14 +3131,8 @@ unifi_siwpmksa(struct net_device *dev, struct iw_request_info *info,
     }
 
 
-    unifi_trace(priv, UDBG1, "SIWPMKSA: cmd %d, %02x:%02x:%02x:%02x:%02x:%02x\n",
-                pmksa->cmd,
-                pmksa->bssid.sa_data[0],
-                pmksa->bssid.sa_data[1],
-                pmksa->bssid.sa_data[2],
-                pmksa->bssid.sa_data[3],
-                pmksa->bssid.sa_data[4],
-                pmksa->bssid.sa_data[5]);
+       unifi_trace(priv, UDBG1, "SIWPMKSA: cmd %d, %pM\n", pmksa->cmd,
+               pmksa->bssid.sa_data);
 
     pmkid_list.pmkids = NULL;
     switch (pmksa->cmd) {