Commit 889300fa authored by Eliad Peller's avatar Eliad Peller Committed by Luciano Coelho
Browse files

wlcore: lazy-enable device roles 



Enable device roles just before starting it.
This way, a single device role should be enough
for all vifs, as we can't use concurrent device
roles (which require ROC) anyway.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarLuciano Coelho <luca@coelho.fi>
parent 8dc57430

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

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

		return -EINVAL;



	ret = wl12xx_cmd_role_start_dev(wl, 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);

	if (ret < 0)

		goto out_disable;



	ret = wl12xx_roc(wl, wlvif, wlvif->dev_role_id);

	if (ret < 0)

		goto out_stop;
@@ -1800,6 +1807,8 @@ int wl12xx_start_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif) 


out_stop:

	wl12xx_cmd_role_stop_dev(wl, wlvif);

out_disable:

	wl12xx_cmd_role_disable(wl, &wlvif->dev_role_id);

out:

	return ret;

}
@@ -1827,6 +1836,11 @@ int wl12xx_stop_dev(struct wl1271 *wl, struct wl12xx_vif *wlvif) 
	ret = wl12xx_cmd_role_stop_dev(wl, wlvif);

	if (ret < 0)

		goto out;



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

	if (ret < 0)

		goto out;



out:

	return ret;

}

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

+0 −19
Original line number Diff line number Diff line
@@ -2273,21 +2273,6 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw, 
		}

	}



	if (wlvif->bss_type == BSS_TYPE_STA_BSS ||

	    wlvif->bss_type == BSS_TYPE_IBSS) {

		/*

		 * The device role is a special role used for

		 * rx and tx frames prior to association (as

		 * the STA role can get packets only from

		 * its associated bssid)

		 */

		ret = wl12xx_cmd_role_enable(wl, vif->addr,

						 WL1271_ROLE_DEVICE,

						 &wlvif->dev_role_id);

		if (ret < 0)

			goto out;

	}



	ret = wl12xx_cmd_role_enable(wl, vif->addr,

				     role_type, &wlvif->role_id);

	if (ret < 0)
@@ -2356,10 +2341,6 @@ static void __wl1271_op_remove_interface(struct wl1271 *wl, 
		    wlvif->bss_type == BSS_TYPE_IBSS) {

			if (wl12xx_dev_role_started(wlvif))

				wl12xx_stop_dev(wl, wlvif);



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

			if (ret < 0)

				goto deinit;

		}



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE