Attachment #842719 for bug #836165




		break;
	case NL80211_AUTHTYPE_NETWORK_EAP:
		WL_DBG(("network eap\n"));
		break;
	default:
		val = 2;
		WL_ERR(("invalid auth type (%d)\n", sme->auth_type));

                    const wl_event_msg_t *e, void *data)
{
	struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
	struct cfg80211_roam_info roam_info = {};
#endif
	s32 err = 0;

	wl_get_assoc_ies(wl);
	memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN);
	memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
	wl_update_bss_info(wl);

#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
 	struct cfg80211_bss *bss;
 	struct wlc_ssid *ssid;
	struct cfg80211_roam_info roam_info;
 	ssid = &wl->profile->ssid;
 	bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
 	ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
	// Rel. commit "cfg80211: Indicate MLO connection info in connect and roam callbacks" (Veerendranath Jakkam, Wed Jun 8)
#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
	roam_info.bss = bss;
	roam_info.channel = &wl->conf->channel,
	roam_info.bssid = (u8 *)&wl->bssid,
#else
	roam_info.links[0].bss = bss;
#endif
	roam_info.req_ie = conn_info->req_ie,
	roam_info.req_ie_len = conn_info->req_ie_len,
	roam_info.resp_ie = conn_info->resp_ie,
	roam_info.resp_ie_len = conn_info->resp_ie_len,
#endif

	wl_get_assoc_ies(wl);
	memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN);
	memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
	wl_update_bss_info(wl);

#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
	cfg80211_roamed(ndev, &roam_info, GFP_KERNEL);
#else
	cfg80211_roamed(ndev,

Return to bug 836165

Lines 791-796 Link Here

(-)a/src/wl/sys/wl_cfg80211_hybrid.c (-9 / +20 lines)
791	break;	791	break;
792	case NL80211_AUTHTYPE_NETWORK_EAP:	792	case NL80211_AUTHTYPE_NETWORK_EAP:
793	WL_DBG(("network eap\n"));	793	WL_DBG(("network eap\n"));
		794	break;
794	default:	795	default:
795	val = 2;	796	val = 2;
796	WL_ERR(("invalid auth type (%d)\n", sme->auth_type));	797	WL_ERR(("invalid auth type (%d)\n", sme->auth_type));
Lines 2348-2371 Link Here
2348	const wl_event_msg_t e, void data)	2349	const wl_event_msg_t e, void data)
2349	{	2350	{
2350	struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);	2351	struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
2351	#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
2352	struct cfg80211_roam_info roam_info = {};
2353	#endif
2354	s32 err = 0;	2352	s32 err = 0;
2355
2356	wl_get_assoc_ies(wl);
2357	memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN);
2358	memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
2359	wl_update_bss_info(wl);
2360
2361	#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)	2353	#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
		2354	struct cfg80211_bss *bss;
		2355	struct wlc_ssid *ssid;
		2356	struct cfg80211_roam_info roam_info;
		2357	ssid = &wl->profile->ssid;
		2358	bss = cfg80211_get_bss(wl_to_wiphy(wl), NULL, (s8 *)&wl->bssid,
		2359	ssid->SSID, ssid->SSID_len, WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS);
		2360	// Rel. commit "cfg80211: Indicate MLO connection info in connect and roam callbacks" (Veerendranath Jakkam, Wed Jun 8)
		2361	#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
		2362	roam_info.bss = bss;
2362	roam_info.channel = &wl->conf->channel,	2363	roam_info.channel = &wl->conf->channel,
2363	roam_info.bssid = (u8 *)&wl->bssid,	2364	roam_info.bssid = (u8 *)&wl->bssid,
		2365	#else
		2366	roam_info.links[0].bss = bss;
		2367	#endif
2364	roam_info.req_ie = conn_info->req_ie,	2368	roam_info.req_ie = conn_info->req_ie,
2365	roam_info.req_ie_len = conn_info->req_ie_len,	2369	roam_info.req_ie_len = conn_info->req_ie_len,
2366	roam_info.resp_ie = conn_info->resp_ie,	2370	roam_info.resp_ie = conn_info->resp_ie,
2367	roam_info.resp_ie_len = conn_info->resp_ie_len,	2371	roam_info.resp_ie_len = conn_info->resp_ie_len,
		2372	#endif
2368		2373
		2374	wl_get_assoc_ies(wl);
		2375	memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN);
		2376	memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
		2377	wl_update_bss_info(wl);
		2378
		2379	#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
2369	cfg80211_roamed(ndev, &roam_info, GFP_KERNEL);	2380	cfg80211_roamed(ndev, &roam_info, GFP_KERNEL);
2370	#else	2381	#else
2371	cfg80211_roamed(ndev,	2382	cfg80211_roamed(ndev,