Merge tag 'wireless-drivers-for-davem-2016-11-29' of... (0fcba289) · Commits · 戴 / test

drivers/net/wireless/marvell/mwifiex/cfg80211.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -2222,8 +2222,9 @@ done:
		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;
		}
		@@ -2283,8 +2284,8 @@ mwifiex_cfg80211_connect(struct wiphy wiphy, struct net_device dev,
		}

		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);

		if (!mwifiex_stop_bg_scan(priv))
		cfg80211_sched_scan_stopped_rtnl(priv->wdev.wiphy);
		@@ -2417,8 +2418,8 @@ mwifiex_cfg80211_join_ibss(struct wiphy wiphy, struct net_device dev,
		}

		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);