} \
} while (0)
-/* Workaround for the wpa_supplicant hanging issue */
+/* Workaround for the wpa_supplicant hanging issue - disabled on Android */
+#ifndef ANDROID_BUILD
#define CSR_WIFI_WEXT_HANG_WORKAROUND
+#endif
#ifdef CSR_WIFI_WEXT_HANG_WORKAROUND
# define UF_RTNL_LOCK() rtnl_lock()
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, "=,");
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);
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) {
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);
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" );
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();
return -EPERM;
}
- enable = *(CsrUint8*)(extra);
+ enable = *(u8*)(extra);
if (enable) {
priv->connection_config.authModeMask = CSR_WIFI_SME_AUTH_MODE_80211_OPEN;
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;
unifi_priv_t *priv = interfacePriv->privPtr;
CsrWifiSmeConnectionInfo connectionInfo;
int r = 0;
- CsrUint8 *bssid;
+ u8 *bssid;
func_enter();
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 {
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. */
}
- 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) {