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

Commit 0b57664c authored by Johannes Berg's avatar Johannes Berg Committed by David S. Miller
Browse files

wireless: fix warnings from QoS patch 



When I removed the special "default" meaning from the QoS
parameters, I forgot to update drivers and this lead to
warnings because some drivers were checking for the special
values and putting in defaults. This fixes that by removing
the default special-casing completely.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d3a8eab0

drivers/net/wireless/b43/main.c

+7 −40
Original line number Diff line number Diff line
@@ -3073,53 +3073,20 @@ static void b43_qos_params_upload(struct b43_wldev *dev, 
				  u16 shm_offset)

{

	u16 params[B43_NR_QOSPARAMS];

	int cw_min, cw_max, aifs, bslots, tmp;

	int bslots, tmp;

	unsigned int i;



	const u16 aCWmin = 0x0001;

	const u16 aCWmax = 0x03FF;



	/* Calculate the default values for the parameters, if needed. */

	switch (shm_offset) {

	case B43_QOS_VOICE:

		aifs = (p->aifs == -1) ? 2 : p->aifs;

		cw_min = (p->cw_min == 0) ? ((aCWmin + 1) / 4 - 1) : p->cw_min;

		cw_max = (p->cw_max == 0) ? ((aCWmin + 1) / 2 - 1) : p->cw_max;

		break;

	case B43_QOS_VIDEO:

		aifs = (p->aifs == -1) ? 2 : p->aifs;

		cw_min = (p->cw_min == 0) ? ((aCWmin + 1) / 2 - 1) : p->cw_min;

		cw_max = (p->cw_max == 0) ? aCWmin : p->cw_max;

		break;

	case B43_QOS_BESTEFFORT:

		aifs = (p->aifs == -1) ? 3 : p->aifs;

		cw_min = (p->cw_min == 0) ? aCWmin : p->cw_min;

		cw_max = (p->cw_max == 0) ? aCWmax : p->cw_max;

		break;

	case B43_QOS_BACKGROUND:

		aifs = (p->aifs == -1) ? 7 : p->aifs;

		cw_min = (p->cw_min == 0) ? aCWmin : p->cw_min;

		cw_max = (p->cw_max == 0) ? aCWmax : p->cw_max;

		break;

	default:

		B43_WARN_ON(1);

		return;

	}

	if (cw_min <= 0)

		cw_min = aCWmin;

	if (cw_max <= 0)

		cw_max = aCWmin;

	bslots = b43_read16(dev, B43_MMIO_RNG) % cw_min;

	bslots = b43_read16(dev, B43_MMIO_RNG) & p->cw_min;



	memset(&params, 0, sizeof(params));



	params[B43_QOSPARAM_TXOP] = p->txop * 32;

	params[B43_QOSPARAM_CWMIN] = cw_min;

	params[B43_QOSPARAM_CWMAX] = cw_max;

	params[B43_QOSPARAM_CWCUR] = cw_min;

	params[B43_QOSPARAM_AIFS] = aifs;

	params[B43_QOSPARAM_CWMIN] = p->cw_min;

	params[B43_QOSPARAM_CWMAX] = p->cw_max;

	params[B43_QOSPARAM_CWCUR] = p->cw_min;

	params[B43_QOSPARAM_AIFS] = p->aifs;

	params[B43_QOSPARAM_BSLOTS] = bslots;

	params[B43_QOSPARAM_REGGAP] = bslots + aifs;

	params[B43_QOSPARAM_REGGAP] = bslots + p->aifs;



	for (i = 0; i < ARRAY_SIZE(params); i++) {

		if (i == B43_QOSPARAM_STATUS) {

drivers/net/wireless/rt2x00/rt2x00mac.c

+1 −4
Original line number Diff line number Diff line
@@ -554,10 +554,7 @@ int rt2x00mac_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, 
	else

		queue->cw_max = 10; /* cw_min: 2^10 = 1024. */



	if (params->aifs >= 0)

	queue->aifs = params->aifs;

	else

		queue->aifs = 2;



	INFO(rt2x00dev,

	     "Configured TX queue %d - CWmin: %d, CWmax: %d, Aifs: %d.\n",