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

Commit 3df5ee60 authored by John W. Linville's avatar John W. Linville
Browse files

wireless: fix warning introduced by "mac80211: QoS related cleanups" 



net/mac80211/wme.c: In function ‘wme_qdiscop_enqueue’:
net/mac80211/wme.c:219: warning: comparison is always false due to limited range of data type

drivers/net/wireless/p54/p54common.c: In function ‘p54_conf_tx’:
drivers/net/wireless/p54/p54common.c:947: warning: comparison is always false due to limited range of data type

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3a4d3af7

drivers/net/wireless/p54/p54common.c

+1 −1
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ static int p54_conf_tx(struct ieee80211_hw *dev, u16 queue, 
	vdcf = (struct p54_tx_control_vdcf *)(((struct p54_control_hdr *)

		((void *)priv->cached_vdcf + priv->tx_hdr_len))->data);



	if ((params) && !((queue < 0) || (queue > 4))) {

	if ((params) && !(queue > 4)) {

		P54_SET_QUEUE(vdcf->queue[queue], params->aifs,

			params->cw_min, params->cw_max, params->txop);

	} else

net/mac80211/wme.c

+9 −14
Original line number Diff line number Diff line
@@ -216,10 +216,6 @@ static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd) 
		rcu_read_unlock();

	}



	if (unlikely(queue < 0)) {

			kfree_skb(skb);

			err = NET_XMIT_DROP;

	} else {

	tid = skb->priority & QOS_CONTROL_TAG1D_MASK;

	pkt_data->queue = (unsigned int) queue;

	qdisc = q->queues[queue];
@@ -230,7 +226,6 @@ static int wme_qdiscop_enqueue(struct sk_buff *skb, struct Qdisc* qd) 
		qd->bstats.packets++;

		return NET_XMIT_SUCCESS;

	}

	}

	qd->qstats.drops++;

	return err;

}