Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
net
/
wireless
/
mwifiex
/
cfg80211.c
diff --git
a/kernel/drivers/net/wireless/mwifiex/cfg80211.c
b/kernel/drivers/net/wireless/mwifiex/cfg80211.c
index
4073116
..
c3331d6
100644
(file)
--- a/
kernel/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/
kernel/drivers/net/wireless/mwifiex/cfg80211.c
@@
-2144,8
+2144,9
@@
done:
is_scanning_required = 1;
} else {
mwifiex_dbg(priv->adapter, MSG,
is_scanning_required = 1;
} else {
mwifiex_dbg(priv->adapter, MSG,
- "info: trying to associate to '%s' bssid %pM\n",
- (char *)req_ssid.ssid, bss->bssid);
+ "info: trying to associate to '%.*s' bssid %pM\n",
+ req_ssid.ssid_len, (char *)req_ssid.ssid,
+ bss->bssid);
memcpy(&priv->cfg_bssid, bss->bssid, ETH_ALEN);
break;
}
memcpy(&priv->cfg_bssid, bss->bssid, ETH_ALEN);
break;
}
@@
-2202,8
+2203,8
@@
mwifiex_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev,
}
mwifiex_dbg(adapter, INFO,
}
mwifiex_dbg(adapter, INFO,
- "info: Trying to associate to %s and bssid %pM\n",
- (char *)sme->ssid, sme->bssid);
+ "info: Trying to associate to %
.*
s and bssid %pM\n",
+ (
int)sme->ssid_len, (
char *)sme->ssid, sme->bssid);
ret = mwifiex_cfg80211_assoc(priv, sme->ssid_len, sme->ssid, sme->bssid,
priv->bss_mode, sme->channel, sme, 0);
ret = mwifiex_cfg80211_assoc(priv, sme->ssid_len, sme->ssid, sme->bssid,
priv->bss_mode, sme->channel, sme, 0);
@@
-2333,8
+2334,8
@@
mwifiex_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
}
mwifiex_dbg(priv->adapter, MSG,
}
mwifiex_dbg(priv->adapter, MSG,
- "info: trying to join to %s and bssid %pM\n",
- (char *)params->ssid, params->bssid);
+ "info: trying to join to %
.*
s and bssid %pM\n",
+
params->ssid_len,
(char *)params->ssid, params->bssid);
mwifiex_set_ibss_params(priv, params);
mwifiex_set_ibss_params(priv, params);