Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7845af35 authored by Eliad Peller's avatar Eliad Peller Committed by Kalle Valo
Browse files

wlcore: add p2p device support 



When starting a p2p mgmt interface, enable its device role. This
allows us to keep the sta role disabled and scan on the dev role.

In general, p2p management interfaces cannot send vif-specific commands
to FW, as the vif role id is invalid. Only off-channel data and scans
happen on this vif, so most ops are not relevant.

If the vif is a p2p mgmt vif, block some mac80211 ops.

Configure rate policies for p2p mgmt interface, as
otherwise p2p packets come out with arbitrary rates.

Since wpa_supplicant currently doesn't support standalone
p2p device mode (without another attached managed interface),
add p2p device to the allowed interface combinations without
decreasing the allowed station count.

Moreover, increase the station count in some cases, as AP
mode usually starts as station interface, and the AP interface
is now different from the p2p management one).

Signed-off-by: default avatarArik Nemtsov <arik@wizery.com>
Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent c32e35f2

drivers/net/wireless/ti/wl12xx/scan.c

+5 −1
Original line number Diff line number Diff line
@@ -118,6 +118,10 @@ static int wl1271_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
	if (passive)

		scan_options |= WL1271_SCAN_OPT_PASSIVE;



	/* scan on the dev role if the regular one is not started */

	if (wlcore_is_p2p_mgmt(wlvif))

		cmd->params.role_id = wlvif->dev_role_id;

	else

		cmd->params.role_id = wlvif->role_id;



	if (WARN_ON(cmd->params.role_id == WL12XX_INVALID_ROLE_ID)) {

drivers/net/wireless/ti/wl18xx/main.c

+47 −1
Original line number Diff line number Diff line
@@ -1804,7 +1804,7 @@ static struct ieee80211_sta_ht_cap wl18xx_mimo_ht_cap_2ghz = { 


static const struct ieee80211_iface_limit wl18xx_iface_limits[] = {

	{

		.max = 3,

		.max = 2,

		.types = BIT(NL80211_IFTYPE_STATION),

	},

	{
@@ -1813,6 +1813,10 @@ static const struct ieee80211_iface_limit wl18xx_iface_limits[] = { 
			 BIT(NL80211_IFTYPE_P2P_GO) |

			 BIT(NL80211_IFTYPE_P2P_CLIENT),

	},

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_P2P_DEVICE),

	},

};



static const struct ieee80211_iface_limit wl18xx_iface_ap_limits[] = {
@@ -1820,6 +1824,48 @@ static const struct ieee80211_iface_limit wl18xx_iface_ap_limits[] = { 
		.max = 2,

		.types = BIT(NL80211_IFTYPE_AP),

	},

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_P2P_DEVICE),

	},

};



static const struct ieee80211_iface_limit wl18xx_iface_ap_cl_limits[] = {

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_STATION),

	},

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_AP),

	},

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_P2P_CLIENT),

	},

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_P2P_DEVICE),

	},

};



static const struct ieee80211_iface_limit wl18xx_iface_ap_go_limits[] = {

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_STATION),

	},

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_AP),

	},

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_P2P_GO),

	},

	{

		.max = 1,

		.types = BIT(NL80211_IFTYPE_P2P_DEVICE),

	},

};



static const struct ieee80211_iface_combination

drivers/net/wireless/ti/wl18xx/scan.c

+5 −1
Original line number Diff line number Diff line
@@ -51,6 +51,10 @@ static int wl18xx_scan_send(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
		goto out;

	}



	/* scan on the dev role if the regular one is not started */

	if (wlcore_is_p2p_mgmt(wlvif))

		cmd->role_id = wlvif->dev_role_id;

	else

		cmd->role_id = wlvif->role_id;



	if (WARN_ON(cmd->role_id == WL12XX_INVALID_ROLE_ID)) {

drivers/net/wireless/ti/wlcore/cmd.c

+16 −10
Original line number Diff line number Diff line
@@ -2003,12 +2003,15 @@ int wl12xx_start_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
		      wlvif->bss_type == BSS_TYPE_IBSS)))

		return -EINVAL;



	/* the dev role is already started for p2p mgmt interfaces */

	if (!wlcore_is_p2p_mgmt(wlvif)) {

		ret = wl12xx_cmd_role_enable(wl,

					     wl12xx_wlvif_to_vif(wlvif)->addr,

					     WL1271_ROLE_DEVICE,

					     &wlvif->dev_role_id);

		if (ret < 0)

			goto out;

	}



	ret = wl12xx_cmd_role_start_dev(wl, wlvif, band, channel);

	if (ret < 0)
@@ -2023,6 +2026,7 @@ int wl12xx_start_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif, 
out_stop:

	wl12xx_cmd_role_stop_dev(wl, wlvif);

out_disable:

	if (!wlcore_is_p2p_mgmt(wlvif))

		wl12xx_cmd_role_disable(wl, &wlvif->dev_role_id);

out:

	return ret;
@@ -2052,9 +2056,11 @@ int wl12xx_stop_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
	if (ret < 0)

		goto out;



	if (!wlcore_is_p2p_mgmt(wlvif)) {

		ret = wl12xx_cmd_role_disable(wl, &wlvif->dev_role_id);

		if (ret < 0)

			goto out;

	}



out:

	return ret;

drivers/net/wireless/ti/wlcore/init.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ static int wl12xx_init_fwlog(struct wl1271 *wl) 
}



/* generic sta initialization (non vif-specific) */

static int wl1271_sta_hw_init(struct wl1271 *wl, struct wl12xx_vif *wlvif)

int wl1271_sta_hw_init(struct wl1271 *wl, struct wl12xx_vif *wlvif)

{

	int ret;